From f19ab89888cda29baec964df3406e1d76a6bdb62 Mon Sep 17 00:00:00 2001 From: "kj7.sung" Date: Mon, 22 Aug 2016 16:41:03 +0900 Subject: [PATCH] Support gps searching state in wearable profile Change-Id: I6e93259c6e11bfeb8e885dc0f8dad2f3bcc130c6 Signed-off-by: kj7.sung --- CMakeLists.txt | 1 - location/CMakeLists.txt | 1 - location/manager/location-gps.c | 8 -------- packaging/liblbs-location.changes | 6 ++++++ packaging/liblbs-location.spec | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 027761f..cdd8e96 100755 --- 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 d0d6830..579f0b8 100644 --- 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 f09e3d7..0690604 100755 --- 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 1025a05..ca083c0 100644 --- 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 + +================================================================================ [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 dc98bbb..94fbc96 100755 --- 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 -- 2.7.4