From eba71b838f543c7dd9390e74911526cf3d48fa26 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Fri, 9 Jan 2009 16:15:27 +0000 Subject: Make the dispatch operation _get_ functions not return a ref Signed-off-by: Sjoerd Simons svn path=/trunk/; revision=2188 --- src/empathy-event-manager.c | 3 --- src/empathy-tube-dispatch.c | 5 ----- src/empathy.c | 8 +------- 3 files changed, 1 insertion(+), 15 deletions(-) (limited to 'src') diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 53c3b84d9..3c7541c82 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -381,7 +381,6 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, g_signal_connect (tp_chat, "message-received", G_CALLBACK (event_manager_chat_message_received_cb), approval); - g_object_unref (G_OBJECT (tp_chat)); } else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) @@ -430,7 +429,6 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, event_manager_add (manager, contact, EMPATHY_IMAGE_DOCUMENT_SEND, msg, approval, event_channel_process_func, NULL); - g_object_unref (channel); g_object_unref (factory); g_object_unref (account); } @@ -461,7 +459,6 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, EMPATHY_CONTACT_READY_NAME, event_manager_tube_got_contact_name_cb, approval); - g_object_unref (channel); g_object_unref (factory); g_object_unref (account); } diff --git a/src/empathy-tube-dispatch.c b/src/empathy-tube-dispatch.c index 31775a6d3..0392b118d 100644 --- a/src/empathy-tube-dispatch.c +++ b/src/empathy-tube-dispatch.c @@ -161,8 +161,6 @@ empathy_tube_dispatch_constructed (GObject *object) tp_cli_dbus_daemon_call_name_has_owner (priv->dbus, -1, priv->bus_name, empathy_tube_dispatch_name_has_owner_cb, NULL, NULL, G_OBJECT (self)); - - g_object_unref (channel); return; failed: @@ -359,7 +357,6 @@ empathy_tube_do_dispatch (EmpathyTubeDispatch *self) channel = empathy_dispatch_operation_get_channel (priv->operation); - /* Create the proxy for the tube handler */ thandler = g_object_new (TP_TYPE_PROXY, "dbus-connection", tp_get_bus (), @@ -382,7 +379,6 @@ empathy_tube_do_dispatch (EmpathyTubeDispatch *self) object_path, handle_type, handle, empathy_tube_dispatch_handle_tube_cb, NULL, NULL, G_OBJECT (self)); - g_object_unref (channel); g_object_unref (thandler); g_object_unref (connection); g_free (object_path); @@ -416,7 +412,6 @@ empathy_tube_dispatch_handle (EmpathyTubeDispatch *tube_dispatch) g_free (msg); tp_cli_channel_call_close (channel, -1, NULL, NULL, NULL, NULL); - g_object_unref (channel); goto done; } diff --git a/src/empathy.c b/src/empathy.c index 5da2b2529..15e233d24 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -102,7 +102,6 @@ dispatch_cb (EmpathyDispatcher *dispatcher, } empathy_chat_window_present_chat (chat); - g_object_unref (tp_chat); empathy_dispatch_operation_claim (operation); } else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA) { @@ -114,11 +113,7 @@ dispatch_cb (EmpathyDispatcher *dispatcher, empathy_dispatch_operation_claim (operation); empathy_call_window_new (call); - - g_object_unref (call); - - } - else if (channel_type == EMP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER) { + } else if (channel_type == EMP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER) { EmpathyFTManager *ft_manager; EmpathyTpFile *tp_file; @@ -126,7 +121,6 @@ dispatch_cb (EmpathyDispatcher *dispatcher, tp_file = EMPATHY_TP_FILE ( empathy_dispatch_operation_get_channel_wrapper (operation)); empathy_ft_manager_add_tp_file (ft_manager, tp_file); - g_object_unref (tp_file); empathy_dispatch_operation_claim (operation); } } -- cgit v1.2.3