From 3ed80df411ea539f78c526931d8391e69813e1ef Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Sun, 3 Jun 2012 02:39:15 +0900 Subject: [PATCH] version is updated to 0.2.0 Remove the method bye of rpc_to_master. And version is updated to 0.2.0 to sync with the version of master. Change-Id: I5d6deb0502a9fa02c258035b86235b027dadc9fa --- debian/changelog | 9 ++++++++ include/rpc_to_master.h | 1 - packaging/com.samsung.data-provider-slave.spec | 2 +- src/dbus.c | 2 -- src/livebox.c | 3 ++- src/rpc_to_master.c | 32 -------------------------- 6 files changed, 12 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index f56c567..f53c523 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +data-provider-slave (0.2.0) unstable; urgency=low + + * Git: slp/pkgs/d/data-provider-slave + * Tag: data-provider-slave_0.2.0 + + Version sync with the data-provider-master + + -- Sung-jae Park Sun, 03 Jun 2012 02:38:42 +0900 + data-provider-slave (0.0.7) unstable; urgency=low * Git: slp/pkgs/d/data-provider-slave diff --git a/include/rpc_to_master.h b/include/rpc_to_master.h index 265329a..ce7a97f 100644 --- a/include/rpc_to_master.h +++ b/include/rpc_to_master.h @@ -1,6 +1,5 @@ extern int rpc_send_hello(void); -extern int rpc_send_bye(void); extern int rpc_send_updated(const char *pkgname, const char *filename, int x, int y, double priority); extern int rpc_send_deleted(const char *pkgname, const char *filename); extern int rpc_send_desc_updated(const char *pkgname, const char *filename, const char *descfile); diff --git a/packaging/com.samsung.data-provider-slave.spec b/packaging/com.samsung.data-provider-slave.spec index e59a718..dc40e3d 100644 --- a/packaging/com.samsung.data-provider-slave.spec +++ b/packaging/com.samsung.data-provider-slave.spec @@ -1,6 +1,6 @@ Name: com.samsung.data-provider-slave Summary: Slave data provider -Version: 0.0.7 +Version: 0.2.0 Release: 1 Group: main/app License: Samsung Proprietary License diff --git a/src/dbus.c b/src/dbus.c index bb41867..b89a248 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -618,8 +618,6 @@ int dbus_fini(void) if (s_info.proxy) { GDBusConnection *conn; - rpc_send_bye(); - conn = g_dbus_proxy_get_connection(s_info.proxy); if (conn && s_info.reg_id) { /* FIXME: Do I really need to do this? */ diff --git a/src/livebox.c b/src/livebox.c index 755482f..8d6ac16 100644 --- a/src/livebox.c +++ b/src/livebox.c @@ -253,6 +253,7 @@ static Eina_Bool updator_cb(void *data) if (so_is_updated(item->inst) <= 0) { if (so_need_to_destroy(item->inst) == NEED_TO_DESTROY) { livebox_destroy(item->inst->item->pkgname, item->inst->filename); + rpc_send_deleted(item->inst->item->pkgname, item->inst->filename); return ECORE_CALLBACK_CANCEL; } @@ -378,6 +379,7 @@ int livebox_fini(void) EINA_LIST_FOREACH_SAFE(s_info.item_list, l, n, item) { livebox_destroy(item->inst->item->pkgname, item->inst->filename); + rpc_send_deleted(item->inst->item->pkgname, item->inst->filename); } if (s_info.pending_timer) { @@ -519,7 +521,6 @@ int livebox_destroy(const char *pkgname, const char *filename) } if (!item->monitor) { - rpc_send_deleted(pkgname, filename); free(item); ret = so_destroy(inst); } diff --git a/src/rpc_to_master.c b/src/rpc_to_master.c index 08b8319..817ea28 100644 --- a/src/rpc_to_master.c +++ b/src/rpc_to_master.c @@ -43,38 +43,6 @@ int rpc_send_hello(void) return 0; } -int rpc_send_bye(void) -{ - GVariant *param; - GDBusProxy *proxy; - GError *err; - - proxy = dbus_get_proxy(); - if (!proxy) - return -EINVAL; - - param = g_variant_new("(s)", main_get_name()); - if (!param) { - ErrPrint("Failed to create variant\n"); - return -EFAULT; - } - - err = NULL; - param = g_dbus_proxy_call_sync(proxy, "bye", param, - G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &err); - - if (!param) { - if (err) { - ErrPrint("Error: %s\n", err->message); - g_error_free(err); - } - - return -EIO; - } - - return 0; -} - int rpc_send_ping(void) { GVariant *param; -- 2.7.4