platform/shared/rubyext/GeoLocation.h in rhodes-3.1.1 vs platform/shared/rubyext/GeoLocation.h in rhodes-3.2.0.beta.1

@@ -65,23 +65,23 @@
 
 public:
 
     static CGeoLocation* Create();
     static void Destroy();
-    static CGeoLocation* getInstance(){ return m_pInstance; }
+    static CGeoLocation* getInstance();
 
-    void setGeoCallback(const char *url, char* params, int timeout_sec, boolean bView);
-    void callGeoCallback(boolean bError, boolean bRunInThread=false);
+    void setGeoCallback(const char *url, const char* params, int timeout_sec, boolean bView);
+    void callGeoCallback(const char* pszError = 0, boolean bRunInThread=false);
     int getGeoTimeoutSec();
 
 
     static void callback_geolocation(void *arg, String const &/*query*/ );
 private:
 
     int getDefaultPingTimeoutSec();
     void setPingTimeoutSec( int nTimeout );
-    void callGeoCallback(const CGeoNotification& oNotify, boolean bError, boolean bRunInThread);
+    void callGeoCallback(const CGeoNotification& oNotify, const char* pszError, boolean bRunInThread);
 
     net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
 };
 
 }
@@ -91,14 +91,19 @@
 
 #ifdef __cplusplus
 extern "C" {
 #endif //__cplusplus
 
+double rho_geo_latitude();
+double rho_geo_longitude();
+float  rho_geo_accuracy();
+
 void rho_geo_set_notification( const char *url, char* params, int timeout_sec);
 void rho_geo_set_view_notification( const char *url, char* params, int timeout_sec);
 
 void rho_geo_callcallback();
 void rho_geo_callcallback_error();
+void rho_geo_callcallback_stop();
 int rho_geo_gettimeout_sec();
 
 double rho_geo_haversine_distance(double lat1, double lon1, double lat2, double lon2);
 
 #ifdef __cplusplus