core: Add name acquired event handler parameter to dbus name own API.

To register handler for name acquired event for dbus name own process,
this patch adds it as parameter.

Change-Id: I91ffaf85100e49a80e9654a039ff544b37e210b4
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>

diff --git a/include/pass/gdbus-util.h b/include/pass/gdbus-util.h
index 2f8e0783c61146ce4bfc4dbdda699e65d0e7e1ec..0efbd68350fcdd3d873e51b244eaf21e7760aaa1 100644 (file)
--- a/include/pass/gdbus-util.h
+++ b/include/pass/gdbus-util.h
@@ -42,7 +42,8 @@ int pass_gdbus_unregister_systemd_startup_callback(guint id);
 int pass_gdbus_get_systemd_dbus_property_string(const char *iface,
                const char *prop, const char **value);
 int pass_gdbus_export_interface(passdbus idx, gpointer instance, const char *obj_path);
-int pass_gdbus_get_name(passdbus idx, const char *name);
+int pass_gdbus_get_name(passdbus idx, const char *name,
+               GBusNameAcquiredCallback gdbus_name_cb);
 int pass_gdbus_connect_signal(gpointer instance, int num_signals,
                struct pass_gdbus_signal_info *signal_infos);
 void pass_gdbus_disconnect_signal(gpointer instance, int num_signals,

diff --git a/src/core/gdbus-util.c b/src/core/gdbus-util.c
index 410f8a6d4699b512211e307d1a48203409a7972a..147e5081f4179f9637231af2f85b88bdcd53e7ae 100644 (file)
--- a/src/core/gdbus-util.c
+++ b/src/core/gdbus-util.c
@@ -51,7 +51,8 @@ int pass_gdbus_export_interface(passdbus idx, gpointer instance,
        return -1;
 }
 
-int pass_gdbus_get_name(passdbus idx, const char *name)
+int pass_gdbus_get_name(passdbus idx, const char *name,
+                       GBusNameAcquiredCallback gdbus_name_cb)
 {
        guint id;
 
@@ -62,7 +63,7 @@ int pass_gdbus_get_name(passdbus idx, const char *name)
 
        id = g_bus_own_name_on_connection(g_dbus_sys_conn[idx], name,
                        G_BUS_NAME_OWNER_FLAGS_NONE,
-                       NULL, NULL, NULL, NULL);
+                       gdbus_name_cb, NULL, NULL, NULL);
        if (id == 0)
                return -ENOSYS;
 

diff --git a/src/core/main.c b/src/core/main.c
index 15475e2d71d94eb0c45e8ef2a46168519c40739f..7d8176ee73366201be17f394ede1fc343bddae3c 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -50,7 +50,7 @@ static int late_init(void)
        signal(SIGTERM, sig_quit);
        signal(SIGUSR1, sig_usr1);
 
-       ret = pass_gdbus_get_name(PASS_DBUS_CORE, DBUS_PASS_BUS_NAME);
+       ret = pass_gdbus_get_name(PASS_DBUS_CORE, DBUS_PASS_BUS_NAME, NULL);
        if (ret < 0)
                return ret;
 

diff --git a/src/thermal/thermal.c b/src/thermal/thermal.c
index e40e70d6520da8b03d2cc39a1e6d26608af4f472..fd91e17131c9e32af4b171189cde97241f12271e 100644 (file)
--- a/src/thermal/thermal.c
+++ b/src/thermal/thermal.c
@@ -331,7 +331,8 @@ static int thermal_probe(void *data)
                return -ENOENT;
        }
 
-       ret = pass_gdbus_get_name(PASS_DBUS_THERMAL, DBUS_THERMAL_BUS_NAME);
+       ret = pass_gdbus_get_name(PASS_DBUS_THERMAL,
+                               DBUS_THERMAL_BUS_NAME, NULL);
        if (ret < 0) {
                _E("Failed to own dbus name '%s'\n", DBUS_THERMAL_BUS_NAME);
                ret = -EINVAL;