diff options
author | jomui <jongmun.woo@samsung.com> | 2015-06-17 21:00:08 +0900 |
---|---|---|
committer | jomui <jongmun.woo@samsung.com> | 2015-06-22 09:43:40 +0900 |
commit | 0851a7d94a6df955b89bf9e68414b05ad0ab2524 (patch) | |
tree | f37459f1b13bb3a92d953fce50fc76cfabc0f5e9 | |
parent | 12f904740fa3322f9fd472f1f04c3141d55bd29b (diff) | |
download | geofence-dbus-0851a7d94a6df955b89bf9e68414b05ad0ab2524.tar.gz geofence-dbus-0851a7d94a6df955b89bf9e68414b05ad0ab2524.tar.bz2 geofence-dbus-0851a7d94a6df955b89bf9e68414b05ad0ab2524.zip |
fixed errorsubmit/tizen_mobile/20150708.024450submit/tizen/20150703.074644accepted/tizen/mobile/20150708.070205
Signed-off-by: jomui <jongmun.woo@samsung.com>
Change-Id: I0c4b2c237d80fe40b650ba010e96e9855fb3a410
-rw-r--r-- | AUTHORS | 10 | ||||
-rw-r--r-- | packaging/geofence-dbus.spec | 6 | ||||
-rw-r--r-- | server/src/geofence_dbus_server.c | 4 |
3 files changed, 11 insertions, 9 deletions
@@ -1,5 +1,5 @@ -Woo-Young Kim <woo02.kim@samsung.com> -Bono Koo <mw.koo@samsung.com> -Ki-Sun SHIN <kisun47.shin@samsung.com> -bosung kwak <bosung.kwak@samsung.com> -Areum Choi <arumi.choi@samsung.com>
\ No newline at end of file +Jongmun Woo <jongmun.woo@samsung.com> +Young-Ae Kang <youngae.kang@samsung.com> +Kyoungjun Sung <kj7.sung@samsung.com> +Karthik Paulraj <p.karthik@samsung.com> +VENKATAKOTIVIJAYALAKSHMINARAYA <lnarayana.k@samsung.com>
\ No newline at end of file diff --git a/packaging/geofence-dbus.spec b/packaging/geofence-dbus.spec index 0a295d8..b44c2ea 100644 --- a/packaging/geofence-dbus.spec +++ b/packaging/geofence-dbus.spec @@ -6,7 +6,7 @@ Group: Location/Libraries License: Apache-2.0 Source0: geofence-dbus-%{version}.tar.gz -%if "%{?tizen_profile_name}" == "tv" +%if "%{?profile}" == "tv" ExcludeArch: %{arm} %ix86 x86_64 %endif @@ -62,9 +62,9 @@ make %{?jobs:-j%jobs} rm -rf %{buildroot} %make_install -%post -p /sbin/ldconfig +%post -n libgeofence-dbus -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libgeofence-dbus -p /sbin/ldconfig %files -n libgeofence-dbus diff --git a/server/src/geofence_dbus_server.c b/server/src/geofence_dbus_server.c index 3158a61..254d00b 100644 --- a/server/src/geofence_dbus_server.c +++ b/server/src/geofence_dbus_server.c @@ -14,6 +14,7 @@ */ #include <stdio.h> +#include <glib.h> #include "generated-code.h" #include "geofence_dbus_server.h" @@ -411,7 +412,8 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u /* register callback for each methods for geofence */ geofence = sloc_object_get_geofence(SLOC_OBJECT(ctx->obj_skeleton)); } - g_return_if_fail(geofence); + if (geofence == NULL) + return; if (ctx->add_geofence_cb) ctx->add_geofence_h = g_signal_connect(geofence, "handle-add-geofence", G_CALLBACK(on_add_geofence), ctx); /* user_data */ |