Support gps searching state in wearable profile

Change-Id: I6e93259c6e11bfeb8e885dc0f8dad2f3bcc130c6
Signed-off-by: kj7.sung <kj7.sung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 027761fc921ba435cafacb69be35c5c8be57ddb9..cdd8e96764d76e529a350232d4763a538d6ce541 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,6 @@ ELSE(FEATURE_PROFILE_TV)
                MESSAGE("<<< Wearable Profile >>>")
        ELSE(FEATURE_PROFILE_WEARABLE)
                MESSAGE("<<< Mobile Profile >>>")
-               ADD_DEFINITIONS("-DTIZEN_PROFILE_MOBILE")
        ENDIF(FEATURE_PROFILE_WEARABLE)
 ENDIF(FEATURE_PROFILE_TV)
 

diff --git a/location/CMakeLists.txt b/location/CMakeLists.txt
index d0d6830f027e60c30f197a7913786db012a675c3..579f0b8b20f80d2af253340e16489c1bed4e2c1f 100644 (file)
--- a/location/CMakeLists.txt
+++ b/location/CMakeLists.txt
@@ -16,7 +16,6 @@ IF(FEATURE_PROFILE_WEARABLE)
        MESSAGE("<<< Wearable Profile >>>")
 ELSE(FEATURE_PROFILE_WEARABLE)
        MESSAGE("<<< Mobile Profile >>>")
-       ADD_DEFINITIONS("-DTIZEN_PROFILE_MOBILE")
 ENDIF(FEATURE_PROFILE_WEARABLE)
 
 ADD_DEFINITIONS("-DLIBDIR=\"${LIBDIR}\"")

diff --git a/location/manager/location-gps.c b/location/manager/location-gps.c
index f09e3d7db5c789536bb3eac44d4c50bd4fdd585d..0690604c3fe841b64b98ffd2e2bb668ae748b29a 100755 (executable)
--- a/location/manager/location-gps.c
+++ b/location/manager/location-gps.c
@@ -229,7 +229,6 @@ static void gps_satellite_cb(gboolean enabled, LocationSatellite *sat, gpointer
        satellite_signaling(self, signals, &(priv->enabled), priv->sat_interval, TRUE, &(priv->sat_updated_timestamp), &(priv->sat), sat);
 }
 
-#ifdef TIZEN_PROFILE_MOBILE
 static void location_setting_search_cb(keynode_t *key, gpointer self)
 {
        LOC_FUNC_LOG
@@ -245,7 +244,6 @@ static void location_setting_search_cb(keynode_t *key, gpointer self)
                }
        }
 }
-#endif
 
 static void location_setting_gps_cb(keynode_t *key, gpointer self)
 {
@@ -309,9 +307,7 @@ static int location_gps_start(LocationGps *self)
        if (priv->app_type != CPPAPP && priv->set_noti == FALSE) {
                location_setting_add_notify(VCONFKEY_LOCATION_ENABLED, location_setting_gps_cb, self);
 
-#ifdef TIZEN_PROFILE_MOBILE
                location_state_add_notify(VCONFKEY_LOCATION_GPS_STATE, location_setting_search_cb, self);
-#endif
                priv->set_noti = TRUE;
        }
 
@@ -340,9 +336,7 @@ static int location_gps_stop(LocationGps *self)
 
        if (priv->app_type != CPPAPP && priv->set_noti == TRUE) {
                location_setting_ignore_notify(VCONFKEY_LOCATION_ENABLED, location_setting_gps_cb);
-#ifdef TIZEN_PROFILE_MOBILE
                location_state_ignore_notify(VCONFKEY_LOCATION_GPS_STATE, location_setting_search_cb);
-#endif
                priv->set_noti = FALSE;
        }
 
@@ -519,9 +513,7 @@ static void location_gps_dispose(GObject *gobject)
 
        if (priv->app_type != CPPAPP && priv->set_noti == TRUE) {
                location_setting_ignore_notify(VCONFKEY_LOCATION_ENABLED, location_setting_gps_cb);
-#ifdef TIZEN_PROFILE_MOBILE
                location_state_ignore_notify(VCONFKEY_LOCATION_GPS_STATE, location_setting_search_cb);
-#endif
                priv->set_noti = FALSE;
        }
 

diff --git a/packaging/liblbs-location.changes b/packaging/liblbs-location.changes
index 1025a0545621b6e739c01994623d56abb103e527..ca083c0d3ffec7e292accaf2335dff094e8fddd2 100644 (file)
--- a/packaging/liblbs-location.changes
+++ b/packaging/liblbs-location.changes
@@ -1,3 +1,9 @@
+[Version]      libslp-location_1.3.3
+[Date]         22 Aug 2016
+[Changes]      Support gps searching state in wearable profile
+[Developer]    Kyoungjun Sung <kj7.sung@samsung.com>
+
+================================================================================
 [Version]      libslp-location_1.3.2
 [Date]         18 Aug 2016
 [Changes]      Change mock location behavior

diff --git a/packaging/liblbs-location.spec b/packaging/liblbs-location.spec
index dc98bbbb5afb7a4799b23e549a421b71204b34e9..94fbc963431bdbc283deaa9611778bfd3227d357 100755 (executable)
--- a/packaging/liblbs-location.spec
+++ b/packaging/liblbs-location.spec
@@ -1,6 +1,6 @@
 Name: liblbs-location
 Summary: Location Based Service Library
-Version: 1.3.2
+Version: 1.3.3
 Release: 1
 Group: Location/Libraries
 License: Apache-2.0