Adjust the initialization sequence of alarm-lib

In multi-thread environment, dbus messages can be delivered before registering interfaces.

Change-Id: I7182f2f0c00ec583e7ced5e8fc4d08497cb56183
Signed-off-by: jusung son <jusung07.son@samsung.com>

diff --git a/alarm-session-agent/agent.c b/alarm-session-agent/agent.c
old mode 100644 (file)
new mode 100755 (executable)
index d9620e7..0e0f29b
--- a/alarm-session-agent/agent.c
+++ b/alarm-session-agent/agent.c
@@ -148,7 +148,11 @@ static void _send_noti(char *service_name, int alarm_id, int msec)
                        NULL,
                        &err);
 
-       g_clear_error(&err);
+       if (err != NULL) {
+               LOGE("g_dbus_connection_call_sync fail : %s", err->message);
+               g_clear_error(&err);
+       }
+
        g_object_unref(conn);
 }
 

diff --git a/src/alarm-lib.c b/src/alarm-lib.c
old mode 100644 (file)
new mode 100755 (executable)
index 9a6024d..1322d1e
--- a/src/alarm-lib.c
+++ b/src/alarm-lib.c
@@ -539,15 +539,6 @@ EXPORT_API int alarmmgr_init(const char *appid)
                alarm_context.session_conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
        }
 
-       owner_id = g_bus_own_name_on_connection(is_user ?
-                       alarm_context.session_conn : alarm_context.connection,
-                       service_name_mod,
-                       G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL);
-       if (owner_id == 0) {
-               ALARM_MGR_EXCEPTION_PRINT("Acquiring the own name is failed. %s", service_name_mod);
-               goto error;
-       }
-
        introspection_data = g_dbus_node_info_new_for_xml(introspection_xml, NULL);
        if (introspection_data == NULL) {
                ALARM_MGR_EXCEPTION_PRINT("g_dbus_node_info_new_for_xml() is failed.");
@@ -564,6 +555,15 @@ EXPORT_API int alarmmgr_init(const char *appid)
                goto error;
        }
 
+       owner_id = g_bus_own_name_on_connection(is_user ?
+                       alarm_context.session_conn : alarm_context.connection,
+                       service_name_mod,
+                       G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL);
+       if (owner_id == 0) {
+               ALARM_MGR_EXCEPTION_PRINT("Acquiring the own name is failed. %s", service_name_mod);
+               goto error;
+       }
+
        alarm_context.app_service_name = strdup(service_name);
        alarm_context.app_service_name_mod = strdup(service_name_mod);