Applied Tizen coding rules 72/68072/1 submit/tizen/20160503.075410
authorkj7.sung <kj7.sung@samsung.com>
Mon, 2 May 2016 06:05:29 +0000 (15:05 +0900)
committerkj7.sung <kj7.sung@samsung.com>
Mon, 2 May 2016 06:05:29 +0000 (15:05 +0900)
Change-Id: Ibc8b3edbaaac0f1471901f011c657795779ad5d4
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
agps/include/lbs_agps.h
agps/include/lbs_agps_priv.h
agps/src/lbs_agps.c
client/include/lbs_dbus_client.h
client/include/lbs_dbus_client_priv.h
client/src/lbs_dbus_client.c
server/include/lbs_dbus_server.h
server/include/lbs_dbus_server_priv.h
server/src/lbs_dbus_server.c

index 8663c76..1e38ca9 100644 (file)
@@ -27,14 +27,14 @@ __BEGIN_DECLS
 #include <gio/gio.h>
 
 typedef enum {
-    LBS_AGPS_ERROR_NONE = 0x0,
-    LBS_AGPS_ERROR_UNKNOWN,
-    LBS_AGPS_ERROR_PARAMETER,
-    LBS_AGPS_ERROR_MEMORY,
-    LBS_AGPS_ERROR_CONNECTION,
-    LBS_AGPS_ERROR_STATUS,
-    LBS_AGPS_ERROR_DBUS_CALL,
-    LBS_AGPS_ERROR_NO_RESULT,
+       LBS_AGPS_ERROR_NONE = 0x0,
+       LBS_AGPS_ERROR_UNKNOWN,
+       LBS_AGPS_ERROR_PARAMETER,
+       LBS_AGPS_ERROR_MEMORY,
+       LBS_AGPS_ERROR_CONNECTION,
+       LBS_AGPS_ERROR_STATUS,
+       LBS_AGPS_ERROR_DBUS_CALL,
+       LBS_AGPS_ERROR_NO_RESULT,
 } lbs_agps_error_e;
 
 int lbs_agps_sms(const char *msg_body, int msg_size);
index 74ae855..cb5ae25 100644 (file)
@@ -32,17 +32,17 @@ __BEGIN_DECLS
 #define LOG_TAG "LBS_AGPS"
 #endif
 
-#define LBS_AGPS_LOGI(fmt,args...)     { LOGI(fmt, ##args); }
-#define LBS_AGPS_LOGD(fmt,args...)     { LOGD(fmt, ##args); }
-#define LBS_AGPS_LOGW(fmt,args...)     { LOGW(fmt, ##args); }
-#define LBS_AGPS_LOGE(fmt,args...)     { LOGE(fmt, ##args); }
+#define LBS_AGPS_LOGI(fmt, args...)    { LOGI(fmt, ##args); }
+#define LBS_AGPS_LOGD(fmt, args...)    { LOGD(fmt, ##args); }
+#define LBS_AGPS_LOGW(fmt, args...)    { LOGW(fmt, ##args); }
+#define LBS_AGPS_LOGE(fmt, args...)    { LOGE(fmt, ##args); }
 
 #else
 
-#define LBS_AGPS_LOGI(fmt,args...)
-#define LBS_AGPS_LOGD(fmt,args...)
-#define LBS_AGPS_LOGW(fmt,args...)
-#define LBS_AGPS_LOGE(fmt,args...)
+#define LBS_AGPS_LOGI(fmt, args...)
+#define LBS_AGPS_LOGD(fmt, args...)
+#define LBS_AGPS_LOGW(fmt, args...)
+#define LBS_AGPS_LOGE(fmt, args...)
 
 #endif
 
index 15cef4b..8492935 100644 (file)
@@ -51,9 +51,8 @@ _create_connection(lbs_agps_s *agps)
        }
 
        agps->conn = g_dbus_connection_new_for_address_sync(agps->addr,
-                                                           G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
-                                                           G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
-                                                           NULL, NULL, &error);
+                                       G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT | G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION, NULL, NULL, &error);
+
        if (!agps->conn) {
                LBS_AGPS_LOGD("Fail to get addr of bus.");
                g_free(agps->addr);
@@ -98,9 +97,9 @@ lbs_agps_destroy(lbs_agps_h lbs_agps)
 
        if (handle->conn) {
                ret = g_dbus_connection_close_sync(handle->conn, NULL, &error);
-               if (ret != TRUE) {
+               if (ret != TRUE)
                        LBS_AGPS_LOGD("Fail to disconnection Dbus");
-               }
+
                g_object_unref(handle->conn);
                handle->conn = NULL;
        }
@@ -141,49 +140,25 @@ lbs_agps_sms(const char *msg_body, int msg_size)
        g_variant_builder_add(builder, "{sv}", "CMD", g_variant_new_string("SUPLNI"));
        g_variant_builder_add(builder, "{sv}", "BODY", g_variant_new_from_data(G_VARIANT_TYPE_BYTESTRING, (gconstpointer) msg_body , (gsize) msg_size, TRUE, NULL, NULL));
        g_variant_builder_add(builder, "{sv}", "SIZE", g_variant_new_int32((gint32) msg_size));
-       param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
 
+       param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
        method = g_variant_ref_sink(g_variant_new("(i)", LBS_SERVER_METHOD_AGPS));
+       proxy = g_dbus_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE, NULL, SERVICE_NAME, SERVICE_PATH, "org.tizen.lbs.Manager", NULL, &error);
 
-       proxy = g_dbus_proxy_new_sync(handle->conn,  /* GDBusConnection */
-                                     G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
-                                     NULL,
-                                     SERVICE_NAME, SERVICE_PATH,
-                                     "org.tizen.lbs.Manager",
-                                     NULL,
-                                     &error);
        if (proxy) {
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "AddReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NONE,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "AddReference", method, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "SetOptions",
-                                            param,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "SetOptions", param, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "RemoveReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "RemoveReference", method, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
@@ -232,52 +207,25 @@ lbs_agps_wap_push(const char *push_header, const char *push_body, int push_body_
        g_variant_builder_add(builder, "{sv}", "HEADER", g_variant_new_string(push_header));
        g_variant_builder_add(builder, "{sv}", "BODY", g_variant_new_from_data(G_VARIANT_TYPE_BYTESTRING, (gconstpointer) push_body , (gsize) push_body_size, TRUE, NULL, NULL));
        g_variant_builder_add(builder, "{sv}", "SIZE", g_variant_new_int32((gint32) push_body_size));
-       param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
 
+       param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
        method = g_variant_ref_sink(g_variant_new("(i)", LBS_SERVER_METHOD_AGPS));
-
-
-       proxy = g_dbus_proxy_new_sync(handle->conn,  /* GDBusConnection */
-                                     G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
-                                     NULL,
-                                     SERVICE_NAME, SERVICE_PATH,
-                                     "org.tizen.lbs.Manager",
-                                     NULL,
-                                     &error);
+       proxy = g_dbus_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE, NULL, SERVICE_NAME, SERVICE_PATH, "org.tizen.lbs.Manager", NULL, &error);
 
        if (proxy) {
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "AddReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NONE,
-                                            -1,
-                                            NULL,
-                                            &error);
-
+               reg = g_dbus_proxy_call_sync(proxy, "AddReference", method, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "SetOptions",
-                                            param,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "SetOptions", param, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "RemoveReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "RemoveReference", method, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
@@ -324,49 +272,25 @@ lbs_set_option(const char *option)
        builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
        g_variant_builder_add(builder, "{sv}", "CMD", g_variant_new_string("SET:OPT"));
        g_variant_builder_add(builder, "{sv}", "OPTION", g_variant_new_string(option));
-       param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
 
+       param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
        method = g_variant_ref_sink(g_variant_new("(i)", LBS_SERVER_METHOD_AGPS));
+       proxy = g_dbus_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE, NULL, SERVICE_NAME, SERVICE_PATH, "org.tizen.lbs.Manager", NULL, &error);
 
-
-       proxy = g_dbus_proxy_new_sync(handle->conn,  /* GDBusConnection */
-                                     G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
-                                     NULL, SERVICE_NAME, SERVICE_PATH,
-                                     "org.tizen.lbs.Manager",
-                                     NULL,
-                                     &error);
        if (proxy) {
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "AddReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NONE,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "AddReference", method, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "SetOptions",
-                                            param,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "SetOptions", param, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "RemoveReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "RemoveReference", method, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
index c2d17f9..d36a144 100644 (file)
@@ -30,31 +30,31 @@ __BEGIN_DECLS
 #define SERVICE_PATH   "/org/tizen/lbs/Providers/LbsServer"
 
 typedef enum {
-    LBS_CLIENT_METHOD_GPS = 0,
-    LBS_CLIENT_METHOD_NPS,
-    LBS_CLIENT_METHOD_AGPS,
-    LBS_CLIENT_METHOD_GEOFENCE,
-    LBS_CLIENT_METHOD_MOCK,
+       LBS_CLIENT_METHOD_GPS = 0,
+       LBS_CLIENT_METHOD_NPS,
+       LBS_CLIENT_METHOD_AGPS,
+       LBS_CLIENT_METHOD_GEOFENCE,
+       LBS_CLIENT_METHOD_MOCK,
 } lbs_client_method_e;
 
 typedef enum {
-    LBS_CLIENT_LOCATION_CB = 0x01,
-    LBS_CLIENT_LOCATION_STATUS_CB = LBS_CLIENT_LOCATION_CB << 0x01,
-    LBS_CLIENT_SATELLITE_CB = LBS_CLIENT_LOCATION_CB << 0x02,
-    LBS_CLIENT_NMEA_CB = LBS_CLIENT_LOCATION_CB << 0x03,
-    LBS_CLIENT_BATCH_CB = LBS_CLIENT_LOCATION_CB << 0x04,
+       LBS_CLIENT_LOCATION_CB = 0x01,
+       LBS_CLIENT_LOCATION_STATUS_CB = LBS_CLIENT_LOCATION_CB << 0x01,
+       LBS_CLIENT_SATELLITE_CB = LBS_CLIENT_LOCATION_CB << 0x02,
+       LBS_CLIENT_NMEA_CB = LBS_CLIENT_LOCATION_CB << 0x03,
+       LBS_CLIENT_BATCH_CB = LBS_CLIENT_LOCATION_CB << 0x04,
 } lbs_client_callback_e;
 
 typedef enum {
-    LBS_CLIENT_ERROR_NONE = 0x0,
-    LBS_CLIENT_ERROR_UNKNOWN,
-    LBS_CLIENT_ERROR_PARAMETER,
-    LBS_CLIENT_ERROR_MEMORY,
-    LBS_CLIENT_ERROR_CONNECTION,
-    LBS_CLIENT_ERROR_STATUS,
-    LBS_CLIENT_ERROR_DBUS_CALL,
-    LBS_CLIENT_ERROR_NO_RESULT,
-    LBS_CLIENT_ERROR_ACCESS_DENIED,
+       LBS_CLIENT_ERROR_NONE = 0x0,
+       LBS_CLIENT_ERROR_UNKNOWN,
+       LBS_CLIENT_ERROR_PARAMETER,
+       LBS_CLIENT_ERROR_MEMORY,
+       LBS_CLIENT_ERROR_CONNECTION,
+       LBS_CLIENT_ERROR_STATUS,
+       LBS_CLIENT_ERROR_DBUS_CALL,
+       LBS_CLIENT_ERROR_NO_RESULT,
+       LBS_CLIENT_ERROR_ACCESS_DENIED,
 } lbs_client_error_e;
 
 typedef void *lbs_client_dbus_h;
@@ -74,9 +74,7 @@ int lbs_client_set_position_update_interval(lbs_client_dbus_h lbs_client, unsign
 
 /* Tizen 3.0 */
 int lbs_client_set_mock_location_async(lbs_client_dbus_h lbs_client,
-       gint method, gdouble latitude, gdouble longitude, gdouble altitude,
-       gdouble speed, gdouble direction, gdouble accuracy,
-       lbs_client_cb callback, void *user_data);
+       gint method, gdouble latitude, gdouble longitude, gdouble altitude, gdouble speed, gdouble direction, gdouble accuracy, lbs_client_cb callback, void *user_data);
 
 __END_DECLS
 
index 3258128..3b0cef5 100644 (file)
@@ -32,19 +32,19 @@ __BEGIN_DECLS
 #define LOG_TAG "LBS_DBUS_CLIENT"
 #endif
 
-#define LBS_CLIENT_LOGI(fmt,args...)   { LOGI(fmt, ##args); }
-#define LBS_CLIENT_LOGD(fmt,args...)   { LOGD(fmt, ##args); }
-#define LBS_CLIENT_LOGW(fmt,args...)   { LOGW(fmt, ##args); }
-#define LBS_CLIENT_LOGE(fmt,args...)   { LOGE(fmt, ##args); }
-#define LBS_CLIENT_SECLOG(fmt,args...) SECURE_LOGW(fmt, ##args)
+#define LBS_CLIENT_LOGI(fmt, args...)  { LOGI(fmt, ##args); }
+#define LBS_CLIENT_LOGD(fmt, args...)  { LOGD(fmt, ##args); }
+#define LBS_CLIENT_LOGW(fmt, args...)  { LOGW(fmt, ##args); }
+#define LBS_CLIENT_LOGE(fmt, args...)  { LOGE(fmt, ##args); }
+#define LBS_CLIENT_SECLOG(fmt, args...)        SECURE_LOGW(fmt, ##args)
 
 #else
 
-#define LBS_CLIENT_LOGI(fmt,args...)
-#define LBS_CLIENT_LOGD(fmt,args...)
-#define LBS_CLIENT_LOGW(fmt,args...)
-#define LBS_CLIENT_LOGE(fmt,args...)
-#define LBS_CLIENT_SECLOG(fmt,args...)
+#define LBS_CLIENT_LOGI(fmt, args...)
+#define LBS_CLIENT_LOGD(fmt, args...)
+#define LBS_CLIENT_LOGW(fmt, args...)
+#define LBS_CLIENT_LOGE(fmt, args...)
+#define LBS_CLIENT_SECLOG(fmt, args...)
 
 #endif
 
index a831347..fd14df1 100755 (executable)
@@ -100,12 +100,11 @@ static int __lbs_check_package_id(char *pkg_id)
        gchar *type = NULL;
        char *package_id = NULL;
 
-       if (!__lbs_get_appid(&app_id)) {
+       if (!__lbs_get_appid(&app_id))
                return FALSE;
-       }
-       if (!__lbs_get_app_type(app_id, &type)) {
+
+       if (!__lbs_get_app_type(app_id, &type))
                return FALSE;
-       }
 
        if ((g_strcmp0(type, "c++app") == 0) || (g_strcmp0(type, "webapp") == 0)) {
                LBS_CLIENT_LOGE("Do not check for App[%s] Type[%s]", app_id, type);
@@ -123,11 +122,11 @@ static int __lbs_check_package_id(char *pkg_id)
        }
        LBS_CLIENT_LOGD("Current package[%s] / Privacy package[%s]", package_id, pkg_id);
 
-       if (g_strcmp0(pkg_id, package_id) == 0) {
+       if (g_strcmp0(pkg_id, package_id) == 0)
                ret = TRUE;
-       } else {
+       else
                ret = FALSE;
-       }
+
        g_free(package_id);
        g_free(app_id);
 
@@ -148,9 +147,8 @@ static void __signal_batch_callback(GDBusConnection *conn, const gchar *name, co
                return;
        }
 
-       if (handle->batch_cb) {
+       if (handle->batch_cb)
                handle->batch_cb(sig, param, handle->user_data);
-       }
 }
 
 static void __signal_callback(GDBusConnection *conn, const gchar *name, const gchar *path, const gchar *interface, const gchar *sig, GVariant *param, gpointer user_data)
@@ -166,9 +164,8 @@ static void __signal_callback(GDBusConnection *conn, const gchar *name, const gc
                return;
        }
 
-       if (handle->user_cb) {
+       if (handle->user_cb)
                handle->user_cb(sig, param, handle->user_data);
-       }
 }
 
 static void __privacy_setting_changed(GDBusConnection *conn, const gchar *name, const gchar *path, const gchar *interface, const gchar *sig, GVariant *param, gpointer user_data)
@@ -179,9 +176,9 @@ static void __privacy_setting_changed(GDBusConnection *conn, const gchar *name,
        gchar *privacy_id = NULL;
 
        g_variant_get(param, "(ss)", &pkg_id, &privacy_id);
-       if (!pkg_id) {
+       if (!pkg_id)
                return;
-       }
+
        if (!privacy_id) {
                g_free(pkg_id);
                return;
@@ -213,13 +210,11 @@ static void __privacy_setting_changed(GDBusConnection *conn, const gchar *name,
        g_free(pkg_id);
        g_free(privacy_id);
 
-       if (lbs_client_stop(handle) != LBS_CLIENT_ERROR_NONE) {
+       if (lbs_client_stop(handle) != LBS_CLIENT_ERROR_NONE)
                LBS_CLIENT_LOGE("lbs_client_stop is fail");
-       }
 
-       if (handle->user_cb) {
+       if (handle->user_cb)
                handle->user_cb("StatusChanged", g_variant_new("(i)", FALSE), handle->user_data);
-       }
 
        lbs_client_destroy(handle);
        handle = NULL;
@@ -274,19 +269,13 @@ lbs_client_privacy_signal_subcribe(lbs_client_dbus_h lbs_client)
        LBS_CLIENT_LOGD("lbs_client_privacy_signal_subcribe");
 
        lbs_client_dbus_s *handle = (lbs_client_dbus_s *)lbs_client;
-       handle->privacy_evt_id = g_dbus_connection_signal_subscribe(handle->conn, NULL,
-                                                                   PRIVACY_INTERFACE,
-                                                                   PRIVACY_MEMBER,
-                                                                   PRIVACY_PATH,
-                                                                   NULL, G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                   __privacy_setting_changed, handle,
-                                                                   NULL);
+       handle->privacy_evt_id = g_dbus_connection_signal_subscribe(handle->conn,
+                                                               NULL, PRIVACY_INTERFACE, PRIVACY_MEMBER, PRIVACY_PATH, NULL, G_DBUS_SIGNAL_FLAGS_NONE, __privacy_setting_changed, handle, NULL);
 
-       if (handle->privacy_evt_id) {
+       if (handle->privacy_evt_id)
                LBS_CLIENT_LOGD("Listening Privacy info");
-       } else {
+       else
                LBS_CLIENT_LOGD("Fail to listen Privacy info");
-       }
 }
 
 static void
@@ -329,20 +318,13 @@ lbs_client_start_batch(lbs_client_dbus_h lbs_client, lbs_client_callback_e callb
 
                if (callback_type & LBS_CLIENT_BATCH_CB) {
                        handle->batch_evt_id = g_dbus_connection_signal_subscribe(handle->conn,
-                                                                                 SERVICE_NAME,                 /* Sender */
-                                                                                 "org.tizen.lbs.Batch",        /* Interface */
-                                                                                 "BatchChanged",                       /* Member */
-                                                                                 signal_path,                  /* Object */
-                                                                                 NULL,                                 /* arg0 */
-                                                                                 G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                                 __signal_batch_callback, handle,
-                                                                                 NULL);
-
-                       if (handle->batch_evt_id) {
+                                                                         SERVICE_NAME, "org.tizen.lbs.Batch", "BatchChanged",
+                                                                         signal_path, NULL, G_DBUS_SIGNAL_FLAGS_NONE, __signal_batch_callback, handle, NULL);
+
+                       if (handle->batch_evt_id)
                                LBS_CLIENT_LOGD("Listening batch info");
-                       } else {
+                       else
                                LBS_CLIENT_LOGD("Fail to listen batch info");
-                       }
                }
        }
        g_free(signal_path);
@@ -357,12 +339,12 @@ lbs_client_start_batch(lbs_client_dbus_h lbs_client, lbs_client_callback_e callb
        method = g_variant_ref_sink(g_variant_new("(i)", handle->method));
 
        proxy = g_dbus_proxy_new_sync(handle->conn,  /* GDBusConnection */
-                                     G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
-                                     NULL,
-                                     SERVICE_NAME, SERVICE_PATH,
-                                     "org.tizen.lbs.Manager",
-                                     NULL,
-                                     &error);
+                                                                 G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
+                                                                 NULL,
+                                                                 SERVICE_NAME, SERVICE_PATH,
+                                                                 "org.tizen.lbs.Manager",
+                                                                 NULL,
+                                                                 &error);
 
        if (error && error->message) {
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
@@ -380,13 +362,8 @@ lbs_client_start_batch(lbs_client_dbus_h lbs_client, lbs_client_callback_e callb
        }
 
        if (proxy) {
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "AddReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NONE,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "AddReference", method, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                                                                        &error);
 
                if (error && error->message) {
                        if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
@@ -407,13 +384,7 @@ lbs_client_start_batch(lbs_client_dbus_h lbs_client, lbs_client_callback_e callb
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "SetOptions",
-                                            param,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "SetOptions", param, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
 
                if (error && error->message) {
                        if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
@@ -477,20 +448,9 @@ lbs_client_set_position_update_interval(lbs_client_dbus_h lbs_client, unsigned i
        param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
        method = g_variant_ref_sink(g_variant_new("(i)", handle->method));
 
-       proxy = g_dbus_proxy_new_sync(handle->conn,  /* GDBusConnection */
-                                     G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
-                                     NULL, SERVICE_NAME, SERVICE_PATH,
-                                     "org.tizen.lbs.Manager",
-                                     NULL,
-                                     &error);
+       proxy = g_dbus_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE, NULL, SERVICE_NAME, SERVICE_PATH, "org.tizen.lbs.Manager", NULL, &error);
        if (proxy) {
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "SetOptions",
-                                            param,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "SetOptions", param, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
                if (reg) {
                        g_variant_unref(reg);
                        reg = NULL;
@@ -533,12 +493,7 @@ lbs_client_stop_batch(lbs_client_dbus_h lbs_client)
        method = g_variant_ref_sink(g_variant_new("(i)", handle->method));
 
        GDBusProxy *proxy = NULL;
-       proxy = g_dbus_proxy_new_sync(handle->conn,  /* GDBusConnection */
-                                     G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
-                                     NULL, SERVICE_NAME, SERVICE_PATH,
-                                     "org.tizen.lbs.Manager",
-                                     NULL,
-                                     &error);
+       proxy = g_dbus_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE, NULL, SERVICE_NAME, SERVICE_PATH, "org.tizen.lbs.Manager", NULL, &error);
 
        if (error && error->message) {
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
@@ -619,75 +574,46 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client
 
                if (callback_type & LBS_CLIENT_LOCATION_CB) {
                        handle->loc_evt_id = g_dbus_connection_signal_subscribe(
-                                                handle->conn,
-                                                SERVICE_NAME, /* Sender */
-                                                "org.tizen.lbs.Position", /* Interface */
-                                                "PositionChanged", /* Member */
-                                                signal_path,
-                                                NULL,
-                                                G_DBUS_SIGNAL_FLAGS_NONE,
-                                                __signal_callback, handle,
-                                                NULL);
-
-                       if (handle->loc_evt_id) {
+                                                                       handle->conn, SERVICE_NAME, "org.tizen.lbs.Position", "PositionChanged",
+                                                                       signal_path, NULL, G_DBUS_SIGNAL_FLAGS_NONE, __signal_callback, handle, NULL);
+
+                       if (handle->loc_evt_id)
                                LBS_CLIENT_LOGD("Listening Position info");
-                       } else {
+                       else
                                LBS_CLIENT_LOGD("Fail to listen Position info");
-                       }
                }
 
                if (callback_type & LBS_CLIENT_LOCATION_STATUS_CB) {
                        handle->loc_status_evt_id = g_dbus_connection_signal_subscribe(handle->conn,
-                                                                                      SERVICE_NAME, /* Sender */
-                                                                                      "org.tizen.lbs.Manager", /* Interface */
-                                                                                      "StatusChanged", /* Member */
-                                                                                      SERVICE_PATH,
-                                                                                      NULL,
-                                                                                      G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                                      __signal_callback, handle,
-                                                                                      NULL);
-
-                       if (handle->loc_status_evt_id) {
+                                                                               SERVICE_NAME, "org.tizen.lbs.Manager", "StatusChanged", SERVICE_PATH,
+                                                                               NULL, G_DBUS_SIGNAL_FLAGS_NONE, __signal_callback, handle, NULL);
+
+                       if (handle->loc_status_evt_id)
                                LBS_CLIENT_LOGD("Listening location Status");
-                       } else {
+                       else
                                LBS_CLIENT_LOGD("Fail to listen location Status");
-                       }
                }
 
                if (callback_type & LBS_CLIENT_SATELLITE_CB) {
                        handle->sat_evt_id = g_dbus_connection_signal_subscribe(handle->conn,
-                                                                               SERVICE_NAME, /* Sender */
-                                                                               "org.tizen.lbs.Satellite", /* Interface */
-                                                                               "SatelliteChanged",     /* Member */
-                                                                               signal_path,
-                                                                               NULL,
-                                                                               G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                               __signal_callback, handle,
-                                                                               NULL);
-
-                       if (handle->sat_evt_id) {
+                                                                       SERVICE_NAME, "org.tizen.lbs.Satellite", "SatelliteChanged",
+                                                                       signal_path, NULL, G_DBUS_SIGNAL_FLAGS_NONE, __signal_callback, handle, NULL);
+
+                       if (handle->sat_evt_id)
                                LBS_CLIENT_LOGD("Listening satellite info");
-                       } else {
+                       else
                                LBS_CLIENT_LOGD("Fail to listen satellite info");
-                       }
                }
 
                if (callback_type & LBS_CLIENT_NMEA_CB) {
                        handle->nmea_evt_id = g_dbus_connection_signal_subscribe(handle->conn,
-                                                                                SERVICE_NAME, /* Sender */
-                                                                                "org.tizen.lbs.Nmea", /* Interface */
-                                                                                "NmeaChanged", /* Member */
-                                                                                signal_path,
-                                                                                NULL,
-                                                                                G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                                __signal_callback, handle,
-                                                                                NULL);
-
-                       if (handle->nmea_evt_id) {
+                                                                        SERVICE_NAME, "org.tizen.lbs.Nmea", "NmeaChanged",
+                                                                        signal_path, NULL, G_DBUS_SIGNAL_FLAGS_NONE, __signal_callback, handle, NULL);
+
+                       if (handle->nmea_evt_id)
                                LBS_CLIENT_LOGD("Listening nmea info");
-                       } else {
+                       else
                                LBS_CLIENT_LOGD("Fail to listen nmea info");
-                       }
                }
        }
        g_free(signal_path);
@@ -703,21 +629,16 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client
        if (__lbs_get_appid(&app_id)) {
                LBS_CLIENT_LOGD("[%s] Request START", app_id);
                g_variant_builder_add(builder, "{sv}", "APP_ID", g_variant_new_string(app_id));
-               if (app_id) {
+
+               if (app_id)
                        g_free(app_id);
-               }
        }
 
        param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
-
        method = g_variant_ref_sink(g_variant_new("(i)", handle->method));
-
        proxy = g_dbus_proxy_new_sync(handle->conn,  /* GDBusConnection */
-                                     G_DBUS_PROXY_FLAGS_NONE, /* GDbusProxyFlags */
-                                     NULL, SERVICE_NAME, SERVICE_PATH,
-                                     "org.tizen.lbs.Manager",
-                                     NULL,
-                                     &error);
+                                                                 G_DBUS_PROXY_FLAGS_NONE, /* GDbusProxyFlags */
+                                                                 NULL, SERVICE_NAME, SERVICE_PATH, "org.tizen.lbs.Manager", NULL, &error);
 
        if (error && error->message) {
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
@@ -735,13 +656,7 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client
        }
 
        if (proxy) {
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "AddReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NONE,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "AddReference", method, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
 
                if (error && error->message) {
                        if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
@@ -762,13 +677,7 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy,
-                                            "SetOptions",
-                                            param,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1,
-                                            NULL,
-                                            &error);
+               reg = g_dbus_proxy_call_sync(proxy, "SetOptions", param, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
                if (error && error->message) {
                        if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
                                LBS_CLIENT_LOGI("Access denied. Msg[%s]", error->message);
@@ -831,22 +740,18 @@ lbs_client_stop(lbs_client_dbus_h lbs_client)
        if (__lbs_get_appid(&app_id)) {
                LBS_CLIENT_LOGD("[%s] Request STOP", app_id);
                g_variant_builder_add(builder, "{sv}", "APP_ID", g_variant_new_string(app_id));
-               if (app_id) {
+
+               if (app_id)
                        g_free(app_id);
-               }
        }
 
        param = g_variant_ref_sink(g_variant_new("(@a{sv})", g_variant_builder_end(builder)));
-
        method = g_variant_ref_sink(g_variant_new("(i)", handle->method));
 
        GDBusProxy *proxy = NULL;
        proxy = g_dbus_proxy_new_sync(handle->conn,  /* GDBusConnection */
-                                     G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
-                                     NULL, SERVICE_NAME, SERVICE_PATH,
-                                     "org.tizen.lbs.Manager",
-                                     NULL,
-                                     &error);
+                                                                 G_DBUS_PROXY_FLAGS_NONE, /*GDbusProxyFlags */
+                                                                 NULL, SERVICE_NAME, SERVICE_PATH, "org.tizen.lbs.Manager", NULL, &error);
 
        if (error && error->message) {
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
@@ -888,10 +793,7 @@ lbs_client_stop(lbs_client_dbus_h lbs_client)
                        reg = NULL;
                }
 
-               reg = g_dbus_proxy_call_sync(proxy, "RemoveReference",
-                                            method,
-                                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                            -1, NULL, &error);
+               reg = g_dbus_proxy_call_sync(proxy, "RemoveReference", method, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
 
                if (error && error->message) {
                        if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
@@ -940,11 +842,11 @@ lbs_client_get_nmea(lbs_client_dbus_h lbs_client, int *timestamp, char **nmea)
 
        LbsNmea *proxy = NULL;
        proxy = lbs_nmea_proxy_new_sync(handle->conn,
-                                       G_DBUS_PROXY_FLAGS_NONE,
-                                       SERVICE_NAME,
-                                       SERVICE_PATH,
-                                       NULL,
-                                       &error);
+                                                                       G_DBUS_PROXY_FLAGS_NONE,
+                                                                       SERVICE_NAME,
+                                                                       SERVICE_PATH,
+                                                                       NULL,
+                                                                       &error);
 
        gint cur_timestamp = 0;
        gchar *cur_nmea_data = NULL;
@@ -997,7 +899,7 @@ _client_create_connection(lbs_client_dbus_s *client)
 }
 
 static void _glib_log(const gchar *log_domain, GLogLevelFlags log_level,
-                      const gchar *msg, gpointer user_data)
+                                         const gchar *msg, gpointer user_data)
 {
        LBS_CLIENT_LOGD("GLIB[%d] : %s", log_level, msg);
 }
@@ -1075,7 +977,7 @@ static void __dbus_set_location_callback(GObject *source_object, GAsyncResult *r
        if (success) {
                if (handle && handle->set_mock_cb) {
                        sig = g_strdup("SetLocation");
-                       param = g_variant_new("(ii)", LBS_CLIENT_METHOD_MOCK, 5); /* LBS_STATUS_BATCH + 1 */
+                       param = g_variant_new("(ii)", LBS_CLIENT_METHOD_MOCK, 5); /* LBS_STATUS_BATCH + 1 */
                        handle->set_mock_cb(sig, param, handle->user_data);
 
                        g_free(sig);
@@ -1085,7 +987,7 @@ static void __dbus_set_location_callback(GObject *source_object, GAsyncResult *r
                LBS_CLIENT_LOGW("SetLocation failed!!!");
                if (handle && handle->set_mock_cb) {
                        sig = g_strdup("SetLocation");
-                       param = g_variant_new("(ii)", LBS_CLIENT_METHOD_MOCK, 6); /* LBS_STATUS_BATCH + 2 */
+                       param = g_variant_new("(ii)", LBS_CLIENT_METHOD_MOCK, 6); /* LBS_STATUS_BATCH + 2 */
                        handle->set_mock_cb(sig, param, handle->user_data);
 
                        g_free(sig);
@@ -1093,11 +995,11 @@ static void __dbus_set_location_callback(GObject *source_object, GAsyncResult *r
                }
 
                if (error && error->message) {
-                       if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
+                       if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
                                LBS_CLIENT_LOGE("Access denied. Msg[%s]", error->message);
-                       } else {
+                       else
                                LBS_CLIENT_LOGE("Fail to new proxy ErrCode[%d], Msg[%s]", error->code, error->message);
-                       }
+
                        g_error_free(error);
                }
        }
@@ -1129,11 +1031,11 @@ lbs_client_set_mock_location_async(lbs_client_dbus_h lbs_client,
        GError *error = NULL;
 
        proxy = lbs_manager_proxy_new_sync(handle->conn,
-                                       G_DBUS_PROXY_FLAGS_NONE,
-                                       SERVICE_NAME,
-                                       SERVICE_PATH,
-                                       NULL,
-                                       &error);
+                                                                       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,
index 44ebd06..c16d14f 100644 (file)
@@ -30,58 +30,41 @@ typedef void (*LbsDbusSetOptionsCB)(GVariant *options, const gchar *client, gpoi
 typedef void (*LbsDbusShutdownCB)(gpointer userdata, gboolean *shutdown_arr);
 
 typedef enum {
-    LBS_SERVER_INTERVAL_ADD = 0,
-    LBS_SERVER_INTERVAL_REMOVE,
-    LBS_SERVER_INTERVAL_UPDATE,
+       LBS_SERVER_INTERVAL_ADD = 0,
+       LBS_SERVER_INTERVAL_REMOVE,
+       LBS_SERVER_INTERVAL_UPDATE,
 } lbs_server_interval_manipulation_type;
 typedef gboolean(*LbsDbusUpdateIntervalCB)(lbs_server_interval_manipulation_type type, const gchar *client, int method, guint interval, gpointer userdata);
 typedef void (*LbsDbusRequestChangeIntervalCB)(int method, gpointer userdata);
-
 typedef void (*LbsDbusGetNmeaCB)(int *timestamp, gchar **nmea_data, gpointer userdata);
 
 /* for geofence callbacks */
-typedef gint(*LbsGeofenceAddFenceCB)(const gchar *app_id,
-                                     gint geofence_type,
-                                     const gchar *name,
-                                     gint direction,
-                                     gdouble latitude,
-                                     gdouble longitude,
-                                     gdouble radius,
-                                     const gchar *bssid,
-                                     gpointer userdata);
+typedef gint(*LbsGeofenceAddFenceCB)(const gchar *app_id, gint geofence_type, const gchar *name, gint direction, gdouble latitude, gdouble longitude, gdouble radius, const gchar *bssid, gpointer userdata);
 typedef void (*LbsGeofenceRemoveFenceCB)(gint fence_id, const gchar *app_id, gpointer userdata);
 typedef void (*LbsGeofencePauseFenceCB)(gint fence_id, const gchar *app_id, gpointer userdata);
 typedef void (*LbsGeofenceResumeFenceCB)(gint fence_id, const gchar *app_id, gpointer userdata);
 typedef void (*LbsGeofenceStartGeofenceCB)(const gchar *app_id, gpointer userdata);
 typedef void (*LbsGeofenceStopGeofenceCB)(const gchar *app_id, gpointer userdata);
+
 /* for gps-geofence (H/W geofence) callbacks */
-typedef void (*GpsGeofenceAddFenceCB)(gint fence_id,
-                                      gdouble latitude,
-                                      gdouble longitude,
-                                      gint radius,
-                                      gint last_state,
-                                      gint monitor_states,
-                                      gint notification_responsiveness,
-                                      gint unknown_timer,
-                                      gpointer userdata);
+typedef void (*GpsGeofenceAddFenceCB)(gint fence_id, gdouble latitude, gdouble longitude, gint radius, gint last_state, gint monitor_states, gint notification_responsiveness, gint unknown_timer, gpointer userdata);
 typedef void (*GpsGeofenceDeleteFenceCB)(gint fence_id, gpointer userdata);
 typedef void (*GpsGeofencePauseFenceCB)(gint fence_id, gpointer userdata);
 typedef void (*GpsGeofenceResumeFenceCB)(gint fence_id, gint monitor_states, gpointer userdata);
 
 /* Tizen 3.0 */
-typedef void (*LbsDbusSetMockLocationCB)(int method, double latitude, double longtitude, double altitude,
-                                         double speed, double direction, double accuracy, gpointer userdata);
+typedef void (*LbsDbusSetMockLocationCB)(int method, double latitude, double longtitude, double altitude, double speed, double direction, double accuracy, gpointer userdata);
 
 
 typedef enum {
-    LBS_SERVER_ERROR_NONE = 0x0,
-    LBS_SERVER_ERROR_UNKNOWN,
-    LBS_SERVER_ERROR_PARAMETER,
-    LBS_SERVER_ERROR_MEMORY,
-    LBS_SERVER_ERROR_CONNECTION,
-    LBS_SERVER_ERROR_STATUS,
-    LBS_SERVER_ERROR_DBUS_CALL,
-    LBS_SERVER_ERROR_NO_RESULT,
+       LBS_SERVER_ERROR_NONE = 0x0,
+       LBS_SERVER_ERROR_UNKNOWN,
+       LBS_SERVER_ERROR_PARAMETER,
+       LBS_SERVER_ERROR_MEMORY,
+       LBS_SERVER_ERROR_CONNECTION,
+       LBS_SERVER_ERROR_STATUS,
+       LBS_SERVER_ERROR_DBUS_CALL,
+       LBS_SERVER_ERROR_NO_RESULT,
 } lbs_server_error_e;
 
 typedef void *lbs_server_dbus_h;
@@ -97,90 +80,45 @@ typedef struct _lbs_server_dbus_cb_t {
        GpsGeofenceDeleteFenceCB delete_hw_fence_cb;
        GpsGeofencePauseFenceCB pause_hw_fence_cb;
        GpsGeofenceResumeFenceCB resume_hw_fence_cb;
-
        LbsDbusSetMockLocationCB set_mock_location_cb;
 } lbs_server_dbus_cb_t;
 
 
-int
-lbs_server_emit_position_changed(lbs_server_dbus_h lbs_server,
-                                 gint arg_method,
-                                 gint arg_fields,
-                                 gint arg_timestamp,
-                                 gdouble arg_latitude,
-                                 gdouble arg_longitude,
-                                 gdouble arg_altitude,
-                                 gdouble arg_speed,
-                                 gdouble arg_direction,
-                                 gdouble arg_climb,
-                                 GVariant *arg_accuracy);
-
-int
-lbs_server_emit_batch_changed(lbs_server_dbus_h lbs_server,
-                              gint arg_num_of_location);
-
-int
-lbs_server_emit_satellite_changed(lbs_server_dbus_h lbs_server,
-                                  gint arg_timestamp,
-                                  gint arg_satellite_used,
-                                  gint arg_satellite_visible,
-                                  GVariant *arg_used_prn,
-                                  GVariant *arg_sat_info);
-
-int
-lbs_server_emit_nmea_changed(lbs_server_dbus_h lbs_server,
-                             gint arg_timestamp,
-                             const gchar *arg_nmea_data);
-
-int
-lbs_server_emit_status_changed(lbs_server_dbus_h lbs_server, int method, gint status);
-
-int
-lbs_server_emit_geofence_status_changed(lbs_server_dbus_h lbs_server, gint status);
-
-int
-lbs_server_emit_geofence_changed(lbs_server_dbus_h lbs_server, const gchar *app_id, gint fence_id, gint fence_state);
-
-int
-lbs_server_emit_gps_geofence_status_changed(lbs_server_dbus_h lbs_server, gint status);
-
-int
-lbs_server_emit_gps_geofence_changed(lbs_server_dbus_h lbs_server, gint fence_id, gint transition, gdouble latitude, gdouble longitude, gdouble altitude, gdouble speed, gdouble bearing, gdouble hor_accuracy);
+int lbs_server_emit_position_changed(lbs_server_dbus_h lbs_server, gint arg_method, gint arg_fields, gint arg_timestamp,
+                                                                       gdouble arg_latitude, gdouble arg_longitude, gdouble arg_altitude, gdouble arg_speed, gdouble arg_direction, gdouble arg_climb, GVariant *arg_accuracy);
+int lbs_server_emit_batch_changed(lbs_server_dbus_h lbs_server, gint arg_num_of_location);
+int lbs_server_emit_satellite_changed(lbs_server_dbus_h lbs_server, gint arg_timestamp, gint arg_satellite_used, gint arg_satellite_visible, GVariant *arg_used_prn, GVariant *arg_sat_info);
+int lbs_server_emit_nmea_changed(lbs_server_dbus_h lbs_server, gint arg_timestamp, const gchar *arg_nmea_data);
+int lbs_server_emit_status_changed(lbs_server_dbus_h lbs_server, int method, gint status);
+int lbs_server_emit_geofence_status_changed(lbs_server_dbus_h lbs_server, gint status);
+int lbs_server_emit_geofence_changed(lbs_server_dbus_h lbs_server, const gchar *app_id, gint fence_id, gint fence_state);
+int lbs_server_emit_gps_geofence_status_changed(lbs_server_dbus_h lbs_server, gint status);
+int lbs_server_emit_gps_geofence_changed(lbs_server_dbus_h lbs_server, gint fence_id, gint transition, gdouble latitude, gdouble longitude, gdouble altitude, gdouble speed, gdouble bearing, gdouble hor_accuracy);
 
 
 #ifdef TIZEN_2_4
 int
 lbs_server_create(char *service_name,
-                  char *service_path,
-                  char *name,
-                  char *description,
-                  lbs_server_dbus_h *lbs_server,
-                  LbsDbusSetOptionsCB set_options_cb,
-                  LbsDbusShutdownCB shutdown_cb,
-                  LbsDbusUpdateIntervalCB update_interval_cb,
-                  LbsDbusRequestChangeIntervalCB request_change_interval_cb,
-                  LbsDbusGetNmeaCB get_nmea_cb,
-                  GpsGeofenceAddFenceCB add_hw_fence_cb,
-                  GpsGeofenceDeleteFenceCB delete_hw_fence_cb,
-                  GpsGeofencePauseFenceCB pause_hw_fence_cb,
-                  GpsGeofenceResumeFenceCB resume_hw_fence_cb,
-                  gpointer userdata);
+                                 char *service_path,
+                                 char *name,
+                                 char *description,
+                                 lbs_server_dbus_h *lbs_server,
+                                 LbsDbusSetOptionsCB set_options_cb,
+                                 LbsDbusShutdownCB shutdown_cb,
+                                 LbsDbusUpdateIntervalCB update_interval_cb,
+                                 LbsDbusRequestChangeIntervalCB request_change_interval_cb,
+                                 LbsDbusGetNmeaCB get_nmea_cb,
+                                 GpsGeofenceAddFenceCB add_hw_fence_cb,
+                                 GpsGeofenceDeleteFenceCB delete_hw_fence_cb,
+                                 GpsGeofencePauseFenceCB pause_hw_fence_cb,
+                                 GpsGeofenceResumeFenceCB resume_hw_fence_cb,
+                                 gpointer userdata);
 
 #endif
 
 /* Tizen 3.0 */
-
-int
-lbs_server_create(char *service_name,
-                  char *service_path,
-                  char *name,
-                  char *description,
-                  lbs_server_dbus_h *lbs_server,
-                  lbs_server_dbus_cb_t *lbs_server_cb,
-                  gpointer userdata);
-
-int
-lbs_server_destroy(lbs_server_dbus_h lbs_server);
+int lbs_server_create(char *service_name, char *service_path, char *name, char *description, lbs_server_dbus_h *lbs_server, lbs_server_dbus_cb_t *lbs_server_cb, gpointer userdata);
+int lbs_server_destroy(lbs_server_dbus_h lbs_server);
 
 
 __END_DECLS
index 07c992c..1440867 100644 (file)
@@ -32,19 +32,19 @@ __BEGIN_DECLS
 #define LOG_TAG "LBS_DBUS_SERVER"
 #endif
 
-#define LBS_SERVER_LOGI(fmt,args...)   { LOGI(fmt, ##args); }
-#define LBS_SERVER_LOGD(fmt,args...)   { LOGD(fmt, ##args); }
-#define LBS_SERVER_LOGW(fmt,args...)   { LOGW(fmt, ##args); }
-#define LBS_SERVER_LOGE(fmt,args...)   { LOGE(fmt, ##args); }
-#define LBS_SERVER_SECLOG(fmt,args...) { SECURE_LOGD(fmt, ##args); }
+#define LBS_SERVER_LOGI(fmt, args...)  { LOGI(fmt, ##args); }
+#define LBS_SERVER_LOGD(fmt, args...)  { LOGD(fmt, ##args); }
+#define LBS_SERVER_LOGW(fmt, args...)  { LOGW(fmt, ##args); }
+#define LBS_SERVER_LOGE(fmt, args...)  { LOGE(fmt, ##args); }
+#define LBS_SERVER_SECLOG(fmt, args...)        { SECURE_LOGD(fmt, ##args); }
 
 #else
 
-#define LBS_SERVER_LOGI(fmt,args...)
-#define LBS_SERVER_LOGD(fmt,args...)
-#define LBS_SERVER_LOGW(fmt,args...)
-#define LBS_SERVER_LOGE(fmt,args...)
-#define LBS_SERVER_SECLOG(fmt,args...)
+#define LBS_SERVER_LOGI(fmt, args...)
+#define LBS_SERVER_LOGD(fmt, args...)
+#define LBS_SERVER_LOGW(fmt, args...)
+#define LBS_SERVER_LOGE(fmt, args...)
+#define LBS_SERVER_SECLOG(fmt, args...)
 
 #endif
 
index 0f814ef..40b4628 100644 (file)
@@ -83,20 +83,19 @@ typedef struct _lbs_server_dbus_s {
 } lbs_server_dbus_s;
 
 typedef enum {
-    LBS_SERVER_METHOD_GPS = 0,
-    LBS_SERVER_METHOD_NPS,
-    LBS_SERVER_METHOD_AGPS,
-    LBS_SERVER_METHOD_GEOFENCE,
-    LBS_SERVER_METHOD_MOCK,
-    LBS_SERVER_METHOD_SIZE,
+       LBS_SERVER_METHOD_GPS = 0,
+       LBS_SERVER_METHOD_NPS,
+       LBS_SERVER_METHOD_AGPS,
+       LBS_SERVER_METHOD_GEOFENCE,
+       LBS_SERVER_METHOD_MOCK,
+       LBS_SERVER_METHOD_SIZE,
 } lbs_server_method_e;
 
 static gboolean lbs_dbus_setup_position_interface(LbsObjectSkeleton *object, lbs_server_dbus_s *ctx)
 {
        LBS_SERVER_LOGD("lbs_dbus_setup_position_interface");
-       if (!object || !ctx) {
+       if (!object || !ctx)
                return FALSE;
-       }
 
        LbsPosition *position = NULL;
        position = lbs_position_skeleton_new();
@@ -109,9 +108,8 @@ static gboolean lbs_dbus_setup_position_interface(LbsObjectSkeleton *object, lbs
 static gboolean lbs_dbus_setup_batch_interface(LbsObjectSkeleton *object, lbs_server_dbus_s *ctx)
 {
        LBS_SERVER_LOGD("lbs_dbus_setup_batch_interface");
-       if (!object || !ctx) {
+       if (!object || !ctx)
                return FALSE;
-       }
 
        LbsBatch *batch = NULL;
        batch = lbs_batch_skeleton_new();
@@ -124,9 +122,8 @@ static gboolean lbs_dbus_setup_batch_interface(LbsObjectSkeleton *object, lbs_se
 static gboolean lbs_dbus_setup_satellite_interface(LbsObjectSkeleton *object, lbs_server_dbus_s *ctx)
 {
        LBS_SERVER_LOGD("lbs_dbus_setup_satellite_interface");
-       if (!object || !ctx) {
+       if (!object || !ctx)
                return FALSE;
-       }
 
        LbsSatellite *sat = NULL;
        sat = lbs_satellite_skeleton_new();
@@ -139,9 +136,8 @@ static gboolean lbs_dbus_setup_satellite_interface(LbsObjectSkeleton *object, lb
 static gboolean lbs_dbus_setup_nmea_interface(LbsObjectSkeleton *object, lbs_server_dbus_s *ctx)
 {
        LBS_SERVER_LOGD("lbs_dbus_setup_nmea_interface");
-       if (!object || !ctx) {
+       if (!object || !ctx)
                return FALSE;
-       }
 
        LbsNmea *nmea = NULL;
        nmea = lbs_nmea_skeleton_new();
@@ -154,9 +150,8 @@ static gboolean lbs_dbus_setup_nmea_interface(LbsObjectSkeleton *object, lbs_ser
 static gboolean lbs_dbus_setup_gps_geofence_interface(LbsObjectSkeleton *object, lbs_server_dbus_s *ctx)
 {
        LBS_SERVER_LOGD("lbs_dbus_setup_gps_geofence_interface");
-       if (!object || !ctx) {
+       if (!object || !ctx)
                return FALSE;
-       }
 
        LbsGpsGeofence *gps_geofence = NULL;
        gps_geofence = lbs_gps_geofence_skeleton_new();
@@ -168,35 +163,28 @@ static gboolean lbs_dbus_setup_gps_geofence_interface(LbsObjectSkeleton *object,
 
 
 static gboolean
-on_manager_getproviderinfo(LbsManager *mgr,
-                           GDBusMethodInvocation *invocation,
-                           gpointer user_data)
+on_manager_getproviderinfo(LbsManager *mgr, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        LBS_SERVER_LOGD("on_manager_getproviderinfo");
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
-       if (ctx->name && ctx->description) {
+       if (ctx->name && ctx->description)
                lbs_manager_complete_get_provider_info(mgr, invocation, ctx->name, ctx->description);
-       } else {
+       else
                lbs_manager_complete_get_provider_info(mgr, invocation, NULL, NULL);
-       }
 
        return TRUE;
 }
 
 static gboolean
-on_manager_getstatus(LbsManager *mgr,
-                     GDBusMethodInvocation *invocation,
-                     gpointer user_data)
+on_manager_getstatus(LbsManager *mgr, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        LBS_SERVER_LOGD("on_manager_getstatus");
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        lbs_manager_complete_get_status(mgr, invocation, ctx->status);
 
@@ -204,14 +192,11 @@ on_manager_getstatus(LbsManager *mgr,
 }
 
 static gboolean
-on_nmea_getnmea(LbsNmea *nmea,
-                GDBusMethodInvocation *invocation,
-                gpointer user_data)
+on_nmea_getnmea(LbsNmea *nmea, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        gint timestamp = 0;
        gchar *nmea_data = NULL;
@@ -227,16 +212,12 @@ on_nmea_getnmea(LbsNmea *nmea,
 }
 
 static gboolean
-on_manager_setoptions(LbsManager *mgr,
-                      GDBusMethodInvocation *invocation,
-                      GVariant *options,
-                      gpointer user_data)
+on_manager_setoptions(LbsManager *mgr, GDBusMethodInvocation *invocation, GVariant *options, gpointer user_data)
 {
        LBS_SERVER_LOGD("ENTER >>>");
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        if (ctx->set_options_cb) {
                const gchar *sender = NULL;
@@ -251,18 +232,14 @@ on_manager_setoptions(LbsManager *mgr,
 }
 
 static gboolean
-on_manager_addreference(LbsManager *mgr,
-                        GDBusMethodInvocation *invocation,
-                        int method,
-                        gpointer user_data)
+on_manager_addreference(LbsManager *mgr, GDBusMethodInvocation *invocation, int method, gpointer user_data)
 {
        LBS_SERVER_LOGD("method: %d", method);
        if (method < 0 || method >= LBS_SERVER_METHOD_SIZE) return FALSE;
 
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        const gchar *sender = NULL;
        gchar *sender_cp = NULL;
@@ -312,9 +289,8 @@ static gboolean lbs_find_method(gpointer key, gpointer value, gpointer user_data
 static gboolean
 lbs_server_remove_client(lbs_server_dbus_s *ctx, const char *client, int method)
 {
-       if (!ctx || !client) {
+       if (!ctx || !client)
                return FALSE;
-       }
 
        int count = 0;
        int *count_arr = (int *) g_hash_table_lookup(ctx->connections, client);
@@ -349,9 +325,8 @@ lbs_server_remove_client(lbs_server_dbus_s *ctx, const char *client, int method)
                        }
                }
 
-               if (!g_hash_table_remove(ctx->connections, client)) {
+               if (!g_hash_table_remove(ctx->connections, client))
                        LBS_SERVER_LOGE("g_hash_table_remove is Fail");
-               }
        }
 
        int index = 0;
@@ -376,31 +351,26 @@ lbs_server_remove_client(lbs_server_dbus_s *ctx, const char *client, int method)
        if (ctx->shutdown_cb) {
                ctx->shutdown_cb(ctx->userdata, shutdown_arr);
                LBS_SERVER_LOGD("shutdown_cb called.. gps:%d, nps:%d, mock:%d",
-                               shutdown_arr[LBS_SERVER_METHOD_GPS], shutdown_arr[LBS_SERVER_METHOD_NPS], shutdown_arr[LBS_SERVER_METHOD_MOCK]);
+                                               shutdown_arr[LBS_SERVER_METHOD_GPS], shutdown_arr[LBS_SERVER_METHOD_NPS], shutdown_arr[LBS_SERVER_METHOD_MOCK]);
        }
 
        g_free(shutdown_arr);
        return TRUE;
 }
 
-static gboolean on_manager_removereference(LbsManager *mgr,
-                                           GDBusMethodInvocation *invocation,
-                                           int method,
-                                           gpointer user_data)
+static gboolean on_manager_removereference(LbsManager *mgr, GDBusMethodInvocation *invocation, int method, gpointer user_data)
 {
        LBS_SERVER_LOGD("method: %d", method);
        if (method < 0 || method >= LBS_SERVER_METHOD_SIZE) return FALSE;
 
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        const gchar *sender = NULL;
        sender = g_dbus_method_invocation_get_sender(invocation);
-       if (!lbs_server_remove_client(ctx, sender, method)) {
+       if (!lbs_server_remove_client(ctx, sender, method))
                LBS_SERVER_LOGD("Unreffed by client that has not been referenced");
-       }
 
        lbs_manager_complete_remove_reference(mgr, invocation);
 
@@ -412,28 +382,27 @@ static gboolean on_manager_removereference(LbsManager *mgr,
  */
 static gboolean
 on_gps_geofence_addfence(LbsGpsGeofence *gps_geofence,
-                         GDBusMethodInvocation *invocation,
-                         gint fence_id,
-                         gdouble latitude,
-                         gdouble longitude,
-                         gint radius,
-                         gint last_state,
-                         gint monitor_states,
-                         gint notification_responsiveness,
-                         gint unknown_timer,
-                         gpointer user_data)
+                                                GDBusMethodInvocation *invocation,
+                                                gint fence_id,
+                                                gdouble latitude,
+                                                gdouble longitude,
+                                                gint radius,
+                                                gint last_state,
+                                                gint monitor_states,
+                                                gint notification_responsiveness,
+                                                gint unknown_timer,
+                                                gpointer user_data)
 {
        LBS_SERVER_LOGD("on_gps_geofence_addfence");
 
        /* call gps-manager's callback, add_hw_fence_cb */
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        if (ctx->add_hw_fence_cb) {
                ctx->add_hw_fence_cb(fence_id, latitude, longitude, radius, last_state, monitor_states,
-                                    notification_responsiveness, unknown_timer, ctx->userdata);
+                                                        notification_responsiveness, unknown_timer, ctx->userdata);
                LBS_SERVER_LOGD("add_hw_fence_cb called");
        }
        lbs_gps_geofence_complete_add_fence(gps_geofence, invocation);
@@ -441,18 +410,14 @@ on_gps_geofence_addfence(LbsGpsGeofence *gps_geofence,
 }
 
 static gboolean
-on_gps_geofence_deletefence(LbsGpsGeofence *gps_geofence,
-                            GDBusMethodInvocation *invocation,
-                            gint fence_id,
-                            gpointer user_data)
+on_gps_geofence_deletefence(LbsGpsGeofence *gps_geofence, GDBusMethodInvocation *invocation, gint fence_id, gpointer user_data)
 {
        LBS_SERVER_LOGD("on_gps_geofence_deletefence");
 
        /* call gps-manager's callback, delete_hw_fence_cb */
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        if (ctx->delete_hw_fence_cb) {
                ctx->delete_hw_fence_cb(fence_id, ctx->userdata);
@@ -463,18 +428,14 @@ on_gps_geofence_deletefence(LbsGpsGeofence *gps_geofence,
 }
 
 static gboolean
-on_gps_geofence_pausefence(LbsGpsGeofence *gps_geofence,
-                           GDBusMethodInvocation *invocation,
-                           gint fence_id,
-                           gpointer    user_data)
+on_gps_geofence_pausefence(LbsGpsGeofence *gps_geofence, GDBusMethodInvocation *invocation, gint fence_id, gpointer user_data)
 {
        LBS_SERVER_LOGD("on_gps_geofence_pausefence");
 
        /* call gps-manager's callback, pause_hw_fence_cb */
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        if (ctx->pause_hw_fence_cb) {
                ctx->pause_hw_fence_cb(fence_id, ctx->userdata);
@@ -486,18 +447,13 @@ on_gps_geofence_pausefence(LbsGpsGeofence *gps_geofence,
 }
 
 static gboolean
-on_gps_geofence_resumefence(LbsGpsGeofence *gps_geofence,
-                            GDBusMethodInvocation *invocation,
-                            gint fence_id,
-                            gint monitor_states,
-                            gpointer user_data)
+on_gps_geofence_resumefence(LbsGpsGeofence *gps_geofence, GDBusMethodInvocation *invocation, gint fence_id, gint monitor_states, gpointer user_data)
 {
        LBS_SERVER_LOGD("on_gps_geofence_resumefence");
 
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        /* call gps-manager's callback, resume_hw_fence_cb */
        if (ctx->resume_hw_fence_cb) {
@@ -514,23 +470,22 @@ on_gps_geofence_resumefence(LbsGpsGeofence *gps_geofence,
 
 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)
+                                                  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);
        if (method < 0 || method >= LBS_SERVER_METHOD_SIZE) return FALSE;
 
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return FALSE;
-       }
 
        if (ctx->set_mock_location_cb) {
                ctx->set_mock_location_cb(method, latitude, longitude, altitude, speed, direction, accuracy, user_data);
@@ -556,9 +511,8 @@ lbs_remove_client_by_force(const char *client, void *data)
                return FALSE;
        } else {
                LBS_SERVER_LOGD("[Client: %s]. Remove all clients in hash table", client);
-               if (!g_hash_table_remove(ctx->connections, client)) {
+               if (!g_hash_table_remove(ctx->connections, client))
                        LBS_SERVER_LOGE("g_hash_table_remove is Fail");
-               }
        }
 
        int index = 0;
@@ -583,7 +537,7 @@ lbs_remove_client_by_force(const char *client, void *data)
        if (ctx->shutdown_cb) {
                ctx->shutdown_cb(ctx->userdata, shutdown_arr);
                LBS_SERVER_LOGD("shutdown_cb called.. gps:%d, nps:%d, mock:%d",
-                               shutdown_arr[LBS_SERVER_METHOD_GPS], shutdown_arr[LBS_SERVER_METHOD_NPS], shutdown_arr[LBS_SERVER_METHOD_MOCK]);
+                                               shutdown_arr[LBS_SERVER_METHOD_GPS], shutdown_arr[LBS_SERVER_METHOD_NPS], shutdown_arr[LBS_SERVER_METHOD_MOCK]);
        }
 
        if (ctx->update_interval_cb) {
@@ -621,12 +575,12 @@ lbs_scan_sender(char *key, char *value, gpointer user_data)
 
 static void
 on_name_owner_changed(GDBusConnection *connection,
-                      const gchar *sender_name,
-                      const gchar *object_path,
-                      const gchar *interface_name,
-                      const gchar *signal_name,
-                      GVariant *parameters,    /* 1. service name 2. prev_owner 3. new_owner */
-                      gpointer user_data)
+                                         const gchar *sender_name,
+                                         const gchar *object_path,
+                                         const gchar *interface_name,
+                                         const gchar *signal_name,
+                                         GVariant *parameters, /* 1. service name 2. prev_owner 3. new_owner */
+                                         gpointer user_data)
 {
        lbs_server_dbus_s *handle = (lbs_server_dbus_s *)user_data;
        g_return_if_fail(handle);
@@ -635,14 +589,14 @@ on_name_owner_changed(GDBusConnection *connection,
        g_variant_get(parameters, "(&s&s&s)", &service_name, &prev_owner, &new_owner);
 
        if (g_strcmp0(object_path, "/org/freedesktop/DBus") != 0 ||
-           g_strcmp0(interface_name, "org.freedesktop.DBus") != 0 ||
-           g_strcmp0(sender_name, "org.freedesktop.DBus") != 0) {
+               g_strcmp0(interface_name, "org.freedesktop.DBus") != 0 ||
+               g_strcmp0(sender_name, "org.freedesktop.DBus") != 0) {
                goto out;
        }
 
        /* if the prev_owner matches the sender name, then remote sender(client) is crashed */
        if (g_strcmp0(new_owner, "") == 0 && (prev_owner != NULL && strlen(prev_owner) > 0)
-           && handle->connections != NULL) {
+               && handle->connections != NULL) {
                if (handle->prev_owner) {
                        g_free(handle->prev_owner);
                        handle->prev_owner = NULL;
@@ -658,9 +612,8 @@ out:
 static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data)
 {
        lbs_server_dbus_s *ctx = (lbs_server_dbus_s *)user_data;
-       if (!ctx) {
+       if (!ctx)
                return;
-       }
 
        LbsManager *mgr = NULL;
        LbsObjectSkeleton *object = NULL;
@@ -696,90 +649,48 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u
        /* Add interface to default object path */
        mgr = lbs_manager_skeleton_new();
 
-       ctx->get_providerinfo_h = g_signal_connect(mgr,
-                                                  "handle-get-provider-info",
-                                                  G_CALLBACK(on_manager_getproviderinfo),
-                                                  ctx); /* user_data */
-       ctx->get_status_h = g_signal_connect(mgr,
-                                            "handle-get-status",
-                                            G_CALLBACK(on_manager_getstatus),
-                                            ctx); /* user_data */
-       if (ctx->set_options_cb != NULL) {
-               ctx->set_option_h = g_signal_connect(mgr,
-                                                    "handle-set-options",
-                                                    G_CALLBACK(on_manager_setoptions),
-                                                    ctx); /* user_data */
-       }
-       ctx->add_reference_h = g_signal_connect(mgr,
-                                               "handle-add-reference",
-                                               G_CALLBACK(on_manager_addreference),
-                                               ctx); /* user_data */
-       if (ctx->shutdown_cb) {
-               ctx->remove_reference_h = g_signal_connect(mgr,
-                                                          "handle-remove-reference",
-                                                          G_CALLBACK(on_manager_removereference),
-                                                          ctx); /* user_data */
-       }
+       ctx->get_providerinfo_h = g_signal_connect(mgr, "handle-get-provider-info", G_CALLBACK(on_manager_getproviderinfo), ctx);
+       ctx->get_status_h = g_signal_connect(mgr, "handle-get-status", G_CALLBACK(on_manager_getstatus), ctx);
+       if (ctx->set_options_cb != NULL)
+               ctx->set_option_h = g_signal_connect(mgr, "handle-set-options", G_CALLBACK(on_manager_setoptions), ctx);
+
+       ctx->add_reference_h = g_signal_connect(mgr, "handle-add-reference", G_CALLBACK(on_manager_addreference), ctx);
+       if (ctx->shutdown_cb)
+               ctx->remove_reference_h = g_signal_connect(mgr, "handle-remove-reference", G_CALLBACK(on_manager_removereference), ctx);
 
        /* Tizen 3.0 */
-       if (ctx->set_mock_location_cb) {
-               ctx->set_mock_location_h = g_signal_connect(mgr,
-                                                          "handle-set-mock-location",
-                                                          G_CALLBACK(on_manager_setmocklocation),
-                                                          ctx);
-       }
+       if (ctx->set_mock_location_cb)
+               ctx->set_mock_location_h = g_signal_connect(mgr, "handle-set-mock-location", G_CALLBACK(on_manager_setmocklocation), ctx);
 
        /* Add interface for nmea method*/
        LbsNmea *nmea = NULL;
        nmea = lbs_nmea_skeleton_new();
-       ctx->get_nmea_h = g_signal_connect(nmea,
-                                          "handle-get-nmea",
-                                          G_CALLBACK(on_nmea_getnmea),
-                                          ctx); /* user_data */
+       ctx->get_nmea_h = g_signal_connect(nmea, "handle-get-nmea", G_CALLBACK(on_nmea_getnmea), ctx);
 
        /* register callback for each methods for H/W gps-geofence */
        LbsGpsGeofence *gps_geofence = NULL;
        if (ctx->obj_skeleton) {
                gps_geofence = lbs_object_get_gps_geofence(LBS_OBJECT(ctx->obj_skeleton));
                if (gps_geofence) {
-                       if (ctx->add_hw_fence_cb) {
-                               ctx->add_hw_fence_h = g_signal_connect(gps_geofence,
-                                                                      "handle-add-fence",
-                                                                      G_CALLBACK(on_gps_geofence_addfence),
-                                                                      ctx); /* user_data */
-                       }
-                       if (ctx->delete_hw_fence_cb) {
-                               ctx->delete_hw_fence_h = g_signal_connect(gps_geofence,
-                                                                         "handle-delete-fence",
-                                                                         G_CALLBACK(on_gps_geofence_deletefence),
-                                                                         ctx); /* user_data */
-                       }
-                       if (ctx->pause_hw_fence_cb) {
-                               ctx->pause_hw_fence_h = g_signal_connect(gps_geofence,
-                                                                        "handle-pause-fence",
-                                                                        G_CALLBACK(on_gps_geofence_pausefence),
-                                                                        ctx); /* user_data */
-                       }
-                       if (ctx->resume_hw_fence_cb) {
-                               ctx->resume_hw_fence_h = g_signal_connect(gps_geofence,
-                                                                         "handle-resume-fence",
-                                                                         G_CALLBACK(on_gps_geofence_resumefence),
-                                                                         ctx); /* user_data */
-                       }
+                       if (ctx->add_hw_fence_cb)
+                               ctx->add_hw_fence_h = g_signal_connect(gps_geofence, "handle-add-fence", G_CALLBACK(on_gps_geofence_addfence), ctx);
+
+                       if (ctx->delete_hw_fence_cb)
+                               ctx->delete_hw_fence_h = g_signal_connect(gps_geofence, "handle-delete-fence", G_CALLBACK(on_gps_geofence_deletefence), ctx);
+
+                       if (ctx->pause_hw_fence_cb)
+                               ctx->pause_hw_fence_h = g_signal_connect(gps_geofence, "handle-pause-fence", G_CALLBACK(on_gps_geofence_pausefence), ctx);
+
+                       if (ctx->resume_hw_fence_cb)
+                               ctx->resume_hw_fence_h = g_signal_connect(gps_geofence, "handle-resume-fence", G_CALLBACK(on_gps_geofence_resumefence), ctx);
+
                        g_object_unref(gps_geofence);
                }
        }
 
        ctx->owner_changed_id = g_dbus_connection_signal_subscribe(conn,
-                                                                  "org.freedesktop.DBus",
-                                                                  "org.freedesktop.DBus",
-                                                                  "NameOwnerChanged",
-                                                                  "/org/freedesktop/DBus",
-                                                                  NULL,
-                                                                  G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                  on_name_owner_changed,
-                                                                  ctx,
-                                                                  NULL);
+                                                  "org.freedesktop.DBus", "org.freedesktop.DBus", "NameOwnerChanged", "/org/freedesktop/DBus", NULL,
+                                                  G_DBUS_SIGNAL_FLAGS_NONE, on_name_owner_changed, ctx, NULL);
 
        g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(mgr), conn, ctx->service_path, NULL);
        g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(nmea), conn, ctx->service_path, NULL);
@@ -789,32 +700,20 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u
        LBS_SERVER_LOGD("done to acquire the dbus");
 }
 
-static void on_name_acquired(GDBusConnection *connection,
-                             const gchar               *name,
-                             gpointer          user_data)
+static void on_name_acquired(GDBusConnection *connection, const gchar *name, gpointer user_data)
 {
        LBS_SERVER_SECLOG("LBS Server: Acquired the name <%s> on the system bus", name);
 }
 
-static void on_name_lost(GDBusConnection *connection,
-                         const gchar           *name,
-                         gpointer              user_data)
+static void on_name_lost(GDBusConnection *connection, const gchar *name, gpointer user_data)
 {
        LBS_SERVER_SECLOG("LBS Server: Lost the name <%s> on the system bus", name);
 }
 
 EXPORT_API int
 lbs_server_emit_position_changed(lbs_server_dbus_h lbs_server,
-                                 gint arg_method,
-                                 gint arg_fields,
-                                 gint arg_timestamp,
-                                 gdouble arg_latitude,
-                                 gdouble arg_longitude,
-                                 gdouble arg_altitude,
-                                 gdouble arg_speed,
-                                 gdouble arg_direction,
-                                 gdouble arg_climb,
-                                 GVariant *arg_accuracy)
+                                                               gint arg_method, gint arg_fields, gint arg_timestamp, gdouble arg_latitude, gdouble arg_longitude, gdouble arg_altitude,
+                                                               gdouble arg_speed, gdouble arg_direction, gdouble arg_climb, GVariant *arg_accuracy)
 {
        LBS_SERVER_LOGD("method:%d", arg_method);
        g_return_val_if_fail(lbs_server, LBS_SERVER_ERROR_PARAMETER);
@@ -828,16 +727,7 @@ lbs_server_emit_position_changed(lbs_server_dbus_h lbs_server,
        g_return_val_if_fail(lbs_pos, LBS_SERVER_ERROR_PARAMETER);
 
        lbs_position_emit_position_changed(lbs_pos,
-                                          arg_method,
-                                          arg_fields,
-                                          arg_timestamp,
-                                          arg_latitude,
-                                          arg_longitude,
-                                          arg_altitude,
-                                          arg_speed,
-                                          arg_direction,
-                                          arg_climb,
-                                          arg_accuracy);
+          arg_method, arg_fields, arg_timestamp, arg_latitude, arg_longitude, arg_altitude, arg_speed, arg_direction, arg_climb, arg_accuracy);
 
        g_object_unref(lbs_pos);
 
@@ -846,8 +736,7 @@ lbs_server_emit_position_changed(lbs_server_dbus_h lbs_server,
 }
 
 EXPORT_API int
-lbs_server_emit_batch_changed(lbs_server_dbus_h lbs_server,
-                              gint arg_num_of_location)
+lbs_server_emit_batch_changed(lbs_server_dbus_h lbs_server, gint arg_num_of_location)
 {
        g_return_val_if_fail(lbs_server, LBS_SERVER_ERROR_PARAMETER);
 
@@ -858,8 +747,7 @@ lbs_server_emit_batch_changed(lbs_server_dbus_h lbs_server,
        lbs_batch = lbs_object_get_batch(LBS_OBJECT(handle->obj_skeleton));
        g_return_val_if_fail(lbs_batch, LBS_SERVER_ERROR_PARAMETER);
 
-       lbs_batch_emit_batch_changed(lbs_batch,
-                                    arg_num_of_location);
+       lbs_batch_emit_batch_changed(lbs_batch, arg_num_of_location);
 
        g_object_unref(lbs_batch);
 
@@ -867,12 +755,7 @@ lbs_server_emit_batch_changed(lbs_server_dbus_h lbs_server,
 }
 
 EXPORT_API int
-lbs_server_emit_satellite_changed(lbs_server_dbus_h lbs_server,
-                                  gint arg_timestamp,
-                                  gint arg_satellite_used,
-                                  gint arg_satellite_visible,
-                                  GVariant *arg_used_prn,
-                                  GVariant *arg_sat_info)
+lbs_server_emit_satellite_changed(lbs_server_dbus_h lbs_server, gint arg_timestamp, gint arg_satellite_used, gint arg_satellite_visible, GVariant *arg_used_prn, GVariant *arg_sat_info)
 {
        g_return_val_if_fail(lbs_server, LBS_SERVER_ERROR_PARAMETER);
        g_return_val_if_fail(arg_used_prn, LBS_SERVER_ERROR_PARAMETER);
@@ -885,21 +768,14 @@ lbs_server_emit_satellite_changed(lbs_server_dbus_h lbs_server,
        sat = lbs_object_get_satellite(LBS_OBJECT(handle->obj_skeleton));
        g_return_val_if_fail(sat, LBS_SERVER_ERROR_PARAMETER);
 
-       lbs_satellite_emit_satellite_changed(sat,
-                                            arg_timestamp,
-                                            arg_satellite_used,
-                                            arg_satellite_visible,
-                                            arg_used_prn,
-                                            arg_sat_info);
+       lbs_satellite_emit_satellite_changed(sat, arg_timestamp, arg_satellite_used, arg_satellite_visible, arg_used_prn, arg_sat_info);
        g_object_unref(sat);
 
        return LBS_SERVER_ERROR_NONE;
 }
 
 EXPORT_API int
-lbs_server_emit_nmea_changed(lbs_server_dbus_h lbs_server,
-                             gint arg_timestamp,
-                             const gchar *arg_nmea_data)
+lbs_server_emit_nmea_changed(lbs_server_dbus_h lbs_server, gint arg_timestamp, const gchar *arg_nmea_data)
 {
        LBS_SERVER_LOGW("timestamp: %d, nmea_data: %s", arg_timestamp, arg_nmea_data);
 
@@ -980,20 +856,13 @@ lbs_server_emit_gps_geofence_changed(lbs_server_dbus_h lbs_server, gint fence_id
        return LBS_SERVER_ERROR_NONE;
 }
 
-static void _glib_log(const gchar *log_domain, GLogLevelFlags log_level,
-                      const gchar *msg, gpointer user_data)
+static void _glib_log(const gchar *log_domain, GLogLevelFlags log_level, const gchar *msg, gpointer user_data)
 {
        LBS_SERVER_LOGD("GLIB[%d]: %s", log_level, msg);
 }
 
 EXPORT_API int
-lbs_server_create(char *service_name,
-                  char *service_path,
-                  char *name,
-                  char *description,
-                  lbs_server_dbus_h *lbs_server,
-                  lbs_server_dbus_cb_t *lbs_server_cb,
-                  gpointer userdata)
+lbs_server_create(char *service_name, char *service_path, char *name, char *description, lbs_server_dbus_h *lbs_server, lbs_server_dbus_cb_t *lbs_server_cb, gpointer userdata)
 {
        LBS_SERVER_LOGD("ENTER >>>");
        g_return_val_if_fail(service_name, LBS_SERVER_ERROR_PARAMETER);
@@ -1009,15 +878,13 @@ lbs_server_create(char *service_name,
 
        server->service_name = g_strdup(service_name);
        server->service_path = g_strdup(service_path);
-
        server->manager = g_dbus_object_manager_server_new(server->service_path);
 
-       if (name) {
+       if (name)
                server->name = g_strdup(name);
-       }
-       if (description) {
+
+       if (description)
                server->description = g_strdup(description);
-       }
 
        server->connections = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
        server->userdata = userdata;
@@ -1040,15 +907,8 @@ lbs_server_create(char *service_name,
        server->delete_hw_fence_cb = lbs_server_cb->delete_hw_fence_cb;
        server->pause_hw_fence_cb = lbs_server_cb->pause_hw_fence_cb;
        server->resume_hw_fence_cb = lbs_server_cb->resume_hw_fence_cb;
-
        server->owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
-                                         service_name,
-                                         G_BUS_NAME_OWNER_FLAGS_REPLACE,
-                                         on_bus_acquired,
-                                         on_name_acquired,
-                                         on_name_lost,
-                                         server,
-                                         NULL);
+                                                 service_name, G_BUS_NAME_OWNER_FLAGS_REPLACE, on_bus_acquired, on_name_acquired, on_name_lost, server, NULL);
 
        LBS_SERVER_LOGD("g_bus_own_name id=[%d]", server->owner_id);