1. fixed that mock-location makes lbs-server crashed

2. Code cleanup

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

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 61e0b24..136c9f6 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(lbs-dbus-client C)
 INCLUDE_DIRECTORIES(
                ${CMAKE_CURRENT_SOURCE_DIR}/include
                ${CMAKE_CURRENT_SOURCE_DIR}
-               ${CMAKE_CURRENT_SOURCE_DIR}/cmake_tmp 
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmake_tmp
                ${CMAKE_BINARY_DIR}
                )
 

diff --git a/client/include/lbs_dbus_client.h b/client/include/lbs_dbus_client.h
index d36a144..e3f9788 100644 (file)
--- a/client/include/lbs_dbus_client.h
+++ b/client/include/lbs_dbus_client.h
@@ -66,8 +66,8 @@ int lbs_client_destroy(lbs_client_dbus_h lbs_client);
 
 int lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client_callback_e callback_type, lbs_client_cb callback, void *user_data);
 int lbs_client_stop(lbs_client_dbus_h lbs_client);
-int lbs_client_start_batch(lbs_client_dbus_h lbs_client, lbs_client_callback_e callback_type, lbs_client_cb callback, unsigned int batch_interval, unsigned int batch_period, void *user_data);
-int lbs_client_stop_batch(lbs_client_dbus_h lbs_client);
+int lbs_client_batch_start(lbs_client_dbus_h lbs_client, lbs_client_callback_e callback_type, lbs_client_cb callback, unsigned int batch_interval, unsigned int batch_period, void *user_data);
+int lbs_client_batch_stop(lbs_client_dbus_h lbs_client);
 
 int lbs_client_get_nmea(lbs_client_dbus_h lbs_client, int *timestamp, char **nmea);
 int lbs_client_set_position_update_interval(lbs_client_dbus_h lbs_client, unsigned int interval);

diff --git a/client/src/lbs_dbus_client.c b/client/src/lbs_dbus_client.c
index ce2b597..8d10e1e 100755 (executable)
--- a/client/src/lbs_dbus_client.c
+++ b/client/src/lbs_dbus_client.c
@@ -291,9 +291,9 @@ lbs_client_privacy_signal_unsubcribe(lbs_client_dbus_h lbs_client)
 }
 
 EXPORT_API int
-lbs_client_start_batch(lbs_client_dbus_h lbs_client, lbs_client_callback_e callback_type, lbs_client_cb callback, unsigned int batch_interval, unsigned int batch_period, void *user_data)
+lbs_client_batch_start(lbs_client_dbus_h lbs_client, lbs_client_callback_e callback_type, lbs_client_cb callback, unsigned int batch_interval, unsigned int batch_period, void *user_data)
 {
-       LBS_CLIENT_LOGD("lbs_client_start_batch");
+       LBS_CLIENT_LOGD("lbs_client_batch_start");
 
        g_return_val_if_fail(lbs_client, LBS_CLIENT_ERROR_PARAMETER);
        g_return_val_if_fail(callback_type >= LBS_CLIENT_LOCATION_CB && callback_type <= LBS_CLIENT_BATCH_CB, LBS_CLIENT_ERROR_PARAMETER);
@@ -466,9 +466,9 @@ lbs_client_set_position_update_interval(lbs_client_dbus_h lbs_client, unsigned i
 }
 
 EXPORT_API int
-lbs_client_stop_batch(lbs_client_dbus_h lbs_client)
+lbs_client_batch_stop(lbs_client_dbus_h lbs_client)
 {
-       LBS_CLIENT_LOGD("lbs_client_stop_batch");
+       LBS_CLIENT_LOGD("lbs_client_batch_stop");
 
        lbs_client_dbus_s *handle = (lbs_client_dbus_s *)lbs_client;
        g_return_val_if_fail(handle, LBS_CLIENT_ERROR_PARAMETER);
@@ -959,7 +959,7 @@ lbs_client_destroy(lbs_client_dbus_h lbs_client)
 
 static void __dbus_set_location_callback(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-       LBS_CLIENT_LOGD("ENTER >>>");
+       LBS_CLIENT_LOGD("ENTER >>> __dbus_set_location_callback");
 
        g_return_if_fail(source_object);
        g_return_if_fail(res);
@@ -1018,7 +1018,7 @@ lbs_client_set_mock_location_async(lbs_client_dbus_h lbs_client,
        gdouble accuracy,
        lbs_client_cb callback, void *user_data)
 {
-       LBS_CLIENT_LOGD("ENTER >>>");
+       LBS_CLIENT_LOGD("ENTER >>> lbs_client_set_mock_location_async");
        g_return_val_if_fail(lbs_client, LBS_CLIENT_ERROR_PARAMETER);
 
        lbs_client_dbus_s *handle = (lbs_client_dbus_s *)lbs_client;
@@ -1030,16 +1030,12 @@ lbs_client_set_mock_location_async(lbs_client_dbus_h lbs_client,
        LbsManager *proxy = NULL;
        GError *error = NULL;
 
-       proxy = lbs_manager_proxy_new_sync(handle->conn,
-                                                                       G_DBUS_PROXY_FLAGS_NONE,
-                                                                       SERVICE_NAME,
-                                                                       SERVICE_PATH,
-                                                                       NULL,
-                                                                       &error);
+       proxy = lbs_manager_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE,
+                                                                       SERVICE_NAME, SERVICE_PATH, NULL, &error);
 
        if (proxy) {
-               lbs_manager_call_set_mock_location(proxy, method, latitude, longitude, altitude, speed, direction, accuracy,
-                       NULL, __dbus_set_location_callback, handle);
+               lbs_manager_call_set_mock_location(proxy, method, latitude, longitude, altitude, speed, direction,
+                                                                                       accuracy, NULL, __dbus_set_location_callback, handle);
 
                g_object_unref(proxy);
                proxy = NULL;

diff --git a/introspection/lbs.xml b/introspection/lbs.xml
index 5a79c3d..192648e 100644 (file)
--- a/introspection/lbs.xml
+++ b/introspection/lbs.xml
@@ -36,6 +36,5 @@
                        -->
                        <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
                </method>
-       
        </interface>
 </node>

diff --git a/packaging/liblbs-dbus.spec b/packaging/liblbs-dbus.spec
index bbf1707..fa7aa8c 100644 (file)
--- a/packaging/liblbs-dbus.spec
+++ b/packaging/liblbs-dbus.spec
@@ -5,7 +5,7 @@ Release:        1
 Group:         Location/Libraries
 License:       Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    %{name}.manifest
+Source1001:    %{name}.manifest
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires: cmake
@@ -41,7 +41,6 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 export CFLAGS+=" -Wno-unused-local-typedefs "
-#cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} 
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir}
 
 make %{?jobs:-j%jobs}

diff --git a/server/src/lbs_dbus_server.c b/server/src/lbs_dbus_server.c
index 40b4628..f6df48d 100644 (file)
--- a/server/src/lbs_dbus_server.c
+++ b/server/src/lbs_dbus_server.c
@@ -469,18 +469,11 @@ on_gps_geofence_resumefence(LbsGpsGeofence *gps_geofence, GDBusMethodInvocation
 /* Tizen 3.0 */
 
 static gboolean
-on_manager_setmocklocation(LbsManager *mgr,
-                                                  GDBusMethodInvocation *invocation,
-                                                  gint method,
-                                                  gdouble latitude,
-                                                  gdouble longitude,
-                                                  gdouble altitude,
-                                                  gdouble speed,
-                                                  gdouble direction,
-                                                  gdouble accuracy,
-                                                  gpointer user_data)
+on_manager_setmocklocation(LbsManager *mgr, GDBusMethodInvocation *invocation, gint method,
+                                                       gdouble latitude, gdouble longitude, gdouble altitude,
+                                                       gdouble speed, gdouble direction, gdouble accuracy, gpointer user_data)
 {
-       LBS_SERVER_LOGD("method: %d", method);
+       LBS_SERVER_LOGD("on_manager_setmocklocation [method: %d]", method);
        if (method < 0 || method >= LBS_SERVER_METHOD_SIZE) return FALSE;
 
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
@@ -488,7 +481,7 @@ on_manager_setmocklocation(LbsManager *mgr,
                return FALSE;
 
        if (ctx->set_mock_location_cb) {
-               ctx->set_mock_location_cb(method, latitude, longitude, altitude, speed, direction, accuracy, user_data);
+               ctx->set_mock_location_cb(method, latitude, longitude, altitude, speed, direction, accuracy, ctx->userdata);
 
                LBS_SERVER_LOGD("set_mock_location_cb was called");
        }