fixed error

Signed-off-by: jomui <jongmun.woo@samsung.com>
Change-Id: I0c4b2c237d80fe40b650ba010e96e9855fb3a410

diff --git a/AUTHORS b/AUTHORS
index 0bc9dd3c2939398f22f63dbf9d122239a4997f4b..541033070baf5012edbb98f6af0e04ef3585b431 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -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 0a295d84734727b8c43e3d3a30d6cf9e12baa3fa..b44c2ea1bc95461c64a13fe39b619bd28e5e5aab 100644 (file)
--- 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 3158a6172744c0cda84b390211fe057195cf31d9..254d00b9a1bb2dd8e90295f7713e51a82ab2dd20 100644 (file)
--- 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 */