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
This commit is contained in:
Lucas De Marchi 2013-01-15 14:34:50 +00:00
parent 2ce05c326f
commit a37c6ca20f
6 changed files with 6 additions and 15 deletions

View File

@ -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, edbus_connection_send(_e_fm_main_udisks_conn, new_msg,
_e_fm_main_udisks_cb_dev_verify, _e_fm_main_udisks_cb_dev_verify,
eina_stringshare_add(path), -1); eina_stringshare_add(path), -1);
edbus_message_unref(new_msg);
INF("DB INIT DEV+: %s", path); 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_arguments_append(main_iter, "as", &array);
edbus_message_iter_container_close(main_iter, array); edbus_message_iter_container_close(main_iter, array);
ret = edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); return edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1);
edbus_message_unref(msg);
return ret;
} }
static EDBus_Pending * static EDBus_Pending *
@ -843,9 +840,7 @@ _volume_eject(EDBus_Proxy *proxy)
edbus_message_iter_arguments_append(main_iter, "as", &array); edbus_message_iter_arguments_append(main_iter, "as", &array);
edbus_message_iter_container_close(main_iter, array); edbus_message_iter_container_close(main_iter, array);
ret = edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); return edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1);
edbus_message_unref(msg);
return ret;
} }
static EDBus_Pending * 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_basic_append(array, 's', opt_txt);
edbus_message_iter_container_close(main_iter, array); edbus_message_iter_container_close(main_iter, array);
ret = edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1); return edbus_proxy_send(proxy, msg, _volume_task_cb, NULL, -1);
edbus_message_unref(msg);
return ret;
} }
static Eina_Bool static Eina_Bool

View File

@ -104,11 +104,11 @@ fm_open(const char *path)
if (!edbus_connection_send(conn, msg, fm_open_reply, NULL, -1)) if (!edbus_connection_send(conn, msg, fm_open_reply, NULL, -1))
{ {
ERR("Could not send DBus Message"); ERR("Could not send DBus Message");
edbus_message_unref(msg);
ecore_idler_add(fm_error_quit_last, NULL); ecore_idler_add(fm_error_quit_last, NULL);
} }
else else
pending++; pending++;
edbus_message_unref(msg);
} }
static const Ecore_Getopt options = { static const Ecore_Getopt options = {

View File

@ -370,8 +370,9 @@ notification_client_dbus_send(E_Notification_Notify *notify, E_Notification_Clie
EINA_SAFETY_ON_NULL_GOTO(p, error); EINA_SAFETY_ON_NULL_GOTO(p, error);
edbus_pending_data_set(p, "cb", cb); edbus_pending_data_set(p, "cb", cb);
edbus_pending_data_set(p, "conn", conn); edbus_pending_data_set(p, "conn", conn);
edbus_message_unref(msg);
return EINA_TRUE; return EINA_TRUE;
error: error:
edbus_message_unref(msg); edbus_message_unref(msg);
return EINA_FALSE; return EINA_FALSE;

View File

@ -17,7 +17,6 @@ static void
_reply(EDBus_Message *message, EDBus_Message *reply) _reply(EDBus_Message *message, EDBus_Message *reply)
{ {
edbus_connection_send(bluez_conn, reply, NULL, NULL, -1); edbus_connection_send(bluez_conn, reply, NULL, NULL, -1);
edbus_message_unref(reply);
edbus_message_unref(message); edbus_message_unref(message);
} }

View File

@ -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_basic_append(variant, 'b', value);
edbus_message_iter_container_close(iter, variant); edbus_message_iter_container_close(iter, variant);
edbus_proxy_send(adap->proxy, new_msg, NULL, NULL, -1); edbus_proxy_send(adap->proxy, new_msg, NULL, NULL, -1);
edbus_message_unref(new_msg);
} }

View File

@ -363,7 +363,6 @@ e_mixer_pulse_init(void)
msg = edbus_message_method_call_new(PULSE_BUS, PULSE_PATH, PULSE_INTERFACE, "suuuuuup"); 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_connection_send(dbus, msg, _dbus_test, NULL, -1); /* test for not running pulse */
edbus_message_unref(msg);
pulse_free(conn); pulse_free(conn);
conn = NULL; conn = NULL;
pulse_shutdown(); pulse_shutdown();