From efe7a0a398af31516d3c04813f5c972c8a9e016c Mon Sep 17 00:00:00 2001 From: "kj7.sung" Date: Mon, 6 Feb 2017 13:28:37 +0900 Subject: [PATCH] sync with latest 3.0 Change-Id: I0f245e4a0d25cfdabfe333b0c57cce235e08cb00 Signed-off-by: kj7.sung --- client/include/lbs_dbus_client.h | 1 + client/src/lbs_dbus_client.c | 31 ++++++++++--------------------- packaging/liblbs-dbus.changes | 6 ++++++ packaging/liblbs-dbus.spec | 2 +- server/src/lbs_dbus_server.c | 1 + 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/client/include/lbs_dbus_client.h b/client/include/lbs_dbus_client.h index 1522d5e..d3a64e6 100644 --- a/client/include/lbs_dbus_client.h +++ b/client/include/lbs_dbus_client.h @@ -35,6 +35,7 @@ typedef enum { LBS_CLIENT_METHOD_AGPS, LBS_CLIENT_METHOD_GEOFENCE, LBS_CLIENT_METHOD_MOCK, + LBS_CLIENT_METHOD_PASSIVE, } lbs_client_method_e; typedef enum { diff --git a/client/src/lbs_dbus_client.c b/client/src/lbs_dbus_client.c index c7b6a88..0e92fa6 100755 --- a/client/src/lbs_dbus_client.c +++ b/client/src/lbs_dbus_client.c @@ -338,13 +338,8 @@ lbs_client_batch_start(lbs_client_dbus_h lbs_client, lbs_client_callback_e callb 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 (error && error->message) { if (error->code == G_DBUS_ERROR_ACCESS_DENIED) { @@ -574,9 +569,9 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client handle->user_data = user_data; if (callback_type & LBS_CLIENT_LOCATION_CB) { - handle->loc_evt_id = g_dbus_connection_signal_subscribe( - handle->conn, SERVICE_NAME, "org.tizen.lbs.Position", "PositionChanged", - signal_path, NULL, G_DBUS_SIGNAL_FLAGS_NONE, __signal_callback, handle, NULL); + handle->loc_evt_id = g_dbus_connection_signal_subscribe(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"); @@ -597,8 +592,8 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client if (callback_type & LBS_CLIENT_SATELLITE_CB) { handle->sat_evt_id = g_dbus_connection_signal_subscribe(handle->conn, - SERVICE_NAME, "org.tizen.lbs.Satellite", "SatelliteChanged", - signal_path, NULL, G_DBUS_SIGNAL_FLAGS_NONE, __signal_callback, handle, NULL); + 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"); @@ -608,8 +603,8 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client if (callback_type & LBS_CLIENT_NMEA_CB) { handle->nmea_evt_id = g_dbus_connection_signal_subscribe(handle->conn, - SERVICE_NAME, "org.tizen.lbs.Nmea", "NmeaChanged", - signal_path, NULL, G_DBUS_SIGNAL_FLAGS_NONE, __signal_callback, handle, NULL); + 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"); @@ -623,7 +618,6 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client LBS_CLIENT_LOGD("START: CMD-START"); builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}")); g_variant_builder_add(builder, "{sv}", "CMD", g_variant_new_string("START")); - g_variant_builder_add(builder, "{sv}", "METHOD", g_variant_new_int32(handle->method)); g_variant_builder_add(builder, "{sv}", "INTERVAL", g_variant_new_uint32(interval)); @@ -842,12 +836,7 @@ lbs_client_get_nmea(lbs_client_dbus_h lbs_client, int *timestamp, char **nmea) *nmea = NULL; LbsNmea *proxy = NULL; - proxy = lbs_nmea_proxy_new_sync(handle->conn, - G_DBUS_PROXY_FLAGS_NONE, - SERVICE_NAME, - SERVICE_PATH, - NULL, - &error); + proxy = lbs_nmea_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE, SERVICE_NAME, SERVICE_PATH, NULL, &error); gint cur_timestamp = 0; gchar *cur_nmea_data = NULL; diff --git a/packaging/liblbs-dbus.changes b/packaging/liblbs-dbus.changes index f348853..e1c3583 100644 --- a/packaging/liblbs-dbus.changes +++ b/packaging/liblbs-dbus.changes @@ -1,3 +1,9 @@ +[Version] lbs-dbus_1.0.3 +[Date] 1 Feb 2017 +[Changes] Support satellite for passive mode +[Developer] Kyoungjun Sung +================================================================================ + [Version] lbs-dbus_1.0.2 [Date] 31 Oct 2016 [Changes] Dynamic interval table for multi handle diff --git a/packaging/liblbs-dbus.spec b/packaging/liblbs-dbus.spec index 67b1eb6..64561f4 100644 --- a/packaging/liblbs-dbus.spec +++ b/packaging/liblbs-dbus.spec @@ -1,6 +1,6 @@ Name: liblbs-dbus Summary: DBus interface for Location Based Service -Version: 1.0.2 +Version: 1.0.3 Release: 1 Group: Location/Libraries License: Apache-2.0 diff --git a/server/src/lbs_dbus_server.c b/server/src/lbs_dbus_server.c index ba7e943..cf32b7f 100644 --- a/server/src/lbs_dbus_server.c +++ b/server/src/lbs_dbus_server.c @@ -88,6 +88,7 @@ typedef enum { LBS_SERVER_METHOD_AGPS, LBS_SERVER_METHOD_GEOFENCE, LBS_SERVER_METHOD_MOCK, + LBS_SERVER_METHOD_PASSIVE, LBS_SERVER_METHOD_SIZE, } lbs_server_method_e; -- 2.34.1