From a37c6ca20fb4a62a1ed5dd6694e0f5cfe4228b51 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 15 Jan 2013 14:34:50 +0000 Subject: [PATCH] e: follow edbus change about unref'ing messages after send Don't unref the messages after calling edbus_*_send() since edbus automatically unrefs them. It was also impressive the number of places that were not unrefing the message when they should. SVN revision: 82808 --- src/bin/e_fm/e_fm_main_udisks.c | 13 +++---------- src/bin/e_fm_cmdline.c | 2 +- src/bin/e_notification.c | 3 ++- src/modules/bluez4/agent.c | 1 - src/modules/bluez4/ebluez4.c | 1 - src/modules/mixer/sys_pulse.c | 1 - 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/bin/e_fm/e_fm_main_udisks.c b/src/bin/e_fm/e_fm_main_udisks.c index f1c7c2629..5eaa2f08e 100644 --- a/src/bin/e_fm/e_fm_main_udisks.c +++ b/src/bin/e_fm/e_fm_main_udisks.c @@ -147,7 +147,6 @@ _e_fm_main_udisks_cb_dev_all(void *data __UNUSED__, const EDBus_Message *msg, edbus_connection_send(_e_fm_main_udisks_conn, new_msg, _e_fm_main_udisks_cb_dev_verify, eina_stringshare_add(path), -1); - edbus_message_unref(new_msg); INF("DB INIT DEV+: %s", path); } } @@ -826,9 +825,7 @@ _volume_umount(EDBus_Proxy *proxy) edbus_message_iter_arguments_append(main_iter, "as", &array); edbus_message_iter_container_close(main_iter, array); - ret = edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); - edbus_message_unref(msg); - return ret; + return edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); } static EDBus_Pending * @@ -843,9 +840,7 @@ _volume_eject(EDBus_Proxy *proxy) edbus_message_iter_arguments_append(main_iter, "as", &array); edbus_message_iter_container_close(main_iter, array); - ret = edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); - edbus_message_unref(msg); - return ret; + return edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); } static EDBus_Pending * @@ -864,9 +859,7 @@ _volume_mount(EDBus_Proxy *proxy, const char *fstype, Eina_List *opt) edbus_message_iter_basic_append(array, 's', opt_txt); edbus_message_iter_container_close(main_iter, array); - ret = edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); - edbus_message_unref(msg); - return ret; + return edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); } static Eina_Bool diff --git a/src/bin/e_fm_cmdline.c b/src/bin/e_fm_cmdline.c index 745c6ea1f..23810ab4b 100644 --- a/src/bin/e_fm_cmdline.c +++ b/src/bin/e_fm_cmdline.c @@ -104,11 +104,11 @@ fm_open(const char *path) if (!edbus_connection_send(conn, msg, fm_open_reply, NULL, -1)) { ERR("Could not send DBus Message"); + edbus_message_unref(msg); ecore_idler_add(fm_error_quit_last, NULL); } else pending++; - edbus_message_unref(msg); } static const Ecore_Getopt options = { diff --git a/src/bin/e_notification.c b/src/bin/e_notification.c index d5c9e1fd8..acc3dd3c1 100644 --- a/src/bin/e_notification.c +++ b/src/bin/e_notification.c @@ -370,8 +370,9 @@ notification_client_dbus_send(E_Notification_Notify *notify, E_Notification_Clie EINA_SAFETY_ON_NULL_GOTO(p, error); edbus_pending_data_set(p, "cb", cb); edbus_pending_data_set(p, "conn", conn); - edbus_message_unref(msg); + return EINA_TRUE; + error: edbus_message_unref(msg); return EINA_FALSE; diff --git a/src/modules/bluez4/agent.c b/src/modules/bluez4/agent.c index 2183244cd..2a72e5fc3 100644 --- a/src/modules/bluez4/agent.c +++ b/src/modules/bluez4/agent.c @@ -17,7 +17,6 @@ static void _reply(EDBus_Message *message, EDBus_Message *reply) { edbus_connection_send(bluez_conn, reply, NULL, NULL, -1); - edbus_message_unref(reply); edbus_message_unref(message); } diff --git a/src/modules/bluez4/ebluez4.c b/src/modules/bluez4/ebluez4.c index 00d2ea605..58fed0672 100644 --- a/src/modules/bluez4/ebluez4.c +++ b/src/modules/bluez4/ebluez4.c @@ -830,5 +830,4 @@ ebluez4_adapter_property_set(Adapter *adap, const char *prop_name, Eina_Bool val edbus_message_iter_basic_append(variant, 'b', value); edbus_message_iter_container_close(iter, variant); edbus_proxy_send(adap->proxy, new_msg, NULL, NULL, -1); - edbus_message_unref(new_msg); } diff --git a/src/modules/mixer/sys_pulse.c b/src/modules/mixer/sys_pulse.c index b133aa726..4d36ec5b6 100644 --- a/src/modules/mixer/sys_pulse.c +++ b/src/modules/mixer/sys_pulse.c @@ -363,7 +363,6 @@ e_mixer_pulse_init(void) msg = edbus_message_method_call_new(PULSE_BUS, PULSE_PATH, PULSE_INTERFACE, "suuuuuup"); edbus_connection_send(dbus, msg, _dbus_test, NULL, -1); /* test for not running pulse */ - edbus_message_unref(msg); pulse_free(conn); conn = NULL; pulse_shutdown();