From 6b80772d3656045f0e25e1d432c5ade1f50b8ac8 Mon Sep 17 00:00:00 2001
From: Martin McNickle <mmcnicklebugs@googlemail.com>
Date: Wed, 2 Sep 2009 09:47:33 -0700
Subject: [PATCH] Bug 513658 - Deprecate isReady() in geolocation provider.
 r=dougt

--HG--
extra : rebase_source : a4ce9d11548b9f09521caf3ced073f6015c2542d
---
 dom/interfaces/geolocation/nsIGeolocationProvider.idl | 10 ++--------
 dom/src/geolocation/GPSDGeolocationProvider.js        | 11 -----------
 dom/src/geolocation/NetworkGeolocationProvider.js     |  5 -----
 dom/src/geolocation/WinMobileLocationProvider.cpp     |  6 ------
 4 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/dom/interfaces/geolocation/nsIGeolocationProvider.idl b/dom/interfaces/geolocation/nsIGeolocationProvider.idl
index 260d5d36891..4955787b9a9 100644
--- a/dom/interfaces/geolocation/nsIGeolocationProvider.idl
+++ b/dom/interfaces/geolocation/nsIGeolocationProvider.idl
@@ -90,9 +90,9 @@ interface nsIGeolocationUpdate : nsISupports {
  * Interface provides location information to the nsGeolocator
  * via the nsIDOMGeolocationCallback interface.  After
  * startup is called, any geo location change should call
- * callback.onRequest().
+ * callback.update().
  */
-[scriptable, uuid(5C819505-8804-496E-9CB2-53089B3DD4EF)]
+[scriptable, uuid(701413ED-0F51-64F7-71C7-4369D8E07D6E)]
 interface nsIGeolocationProvider : nsISupports {
 
   /**
@@ -101,12 +101,6 @@ interface nsIGeolocationProvider : nsISupports {
    */
   void startup();
 
-  /**
-   * Returns true when the devices is ready and has a
-   * postion, otherwise false.
-   */
-   boolean isReady();
-
   /**
    * watch
    * When a location change is observed, notify the callback
diff --git a/dom/src/geolocation/GPSDGeolocationProvider.js b/dom/src/geolocation/GPSDGeolocationProvider.js
index da73dcdd375..4f63d8473aa 100644
--- a/dom/src/geolocation/GPSDGeolocationProvider.js
+++ b/dom/src/geolocation/GPSDGeolocationProvider.js
@@ -180,17 +180,6 @@ GPSDProvider.prototype = {
     this.transport.close(Components.results.NS_OK);
   },
   
-  isReady: function() {
-    LOG("isReady called\n");
-    try {
-      this.inputStream.available();
-    } catch (e) {
-      return false;
-    }
-
-    return true;
-  },
-  
   watch: function(c) {
     LOG("watch called\n");    
 
diff --git a/dom/src/geolocation/NetworkGeolocationProvider.js b/dom/src/geolocation/NetworkGeolocationProvider.js
index 8d3b3e26e9a..d07db72d8d1 100755
--- a/dom/src/geolocation/NetworkGeolocationProvider.js
+++ b/dom/src/geolocation/NetworkGeolocationProvider.js
@@ -188,11 +188,6 @@ WifiGeoPositionProvider.prototype = {
         os.addObserver(this, "private-browsing", false);
     },
 
-    isReady:         function() {
-        LOG("isReady called");
-        return true
-    },
-  
     watch: function(c) {
         LOG("watch called");
         if (!this.wifi_service) {
diff --git a/dom/src/geolocation/WinMobileLocationProvider.cpp b/dom/src/geolocation/WinMobileLocationProvider.cpp
index aecc54d1fda..c98f5d0a7bc 100644
--- a/dom/src/geolocation/WinMobileLocationProvider.cpp
+++ b/dom/src/geolocation/WinMobileLocationProvider.cpp
@@ -278,12 +278,6 @@ NS_IMETHODIMP WinMobileLocationProvider::Startup()
   return NS_OK;
 }
 
-NS_IMETHODIMP WinMobileLocationProvider::IsReady(PRBool *_retval NS_OUTPARAM)
-{
-  *_retval = mHasSeenLocation;
-  return NS_OK;
-}
-
 NS_IMETHODIMP WinMobileLocationProvider::Watch(nsIGeolocationUpdate *callback)
 {
   if (mCallback)