empathy r2188 - in trunk: libempathy libempathy-gtk src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan  9 16:15:27 2009
New Revision: 2188
URL: http://svn.gnome.org/viewvc/empathy?rev=2188&view=rev

Log:
Make the dispatch operation _get_ functions not return a ref

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/libempathy-gtk/empathy-ui-utils.c
   trunk/libempathy/empathy-chatroom-manager.c
   trunk/libempathy/empathy-dispatch-operation.c
   trunk/libempathy/empathy-dispatcher.c
   trunk/libempathy/empathy-tp-chat.c
   trunk/libempathy/empathy-utils.c
   trunk/src/empathy-event-manager.c
   trunk/src/empathy-tube-dispatch.c
   trunk/src/empathy.c

Modified: trunk/libempathy-gtk/empathy-ui-utils.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.c	(original)
+++ trunk/libempathy-gtk/empathy-ui-utils.c	Fri Jan  9 16:15:27 2009
@@ -1443,7 +1443,6 @@
 	empathy_tp_file_offer (tp_file, file, NULL);
 
 	g_object_unref (file);
-	g_object_unref (tp_file);
 }
 
 static void

Modified: trunk/libempathy/empathy-chatroom-manager.c
==============================================================================
--- trunk/libempathy/empathy-chatroom-manager.c	(original)
+++ trunk/libempathy/empathy-chatroom-manager.c	Fri Jan  9 16:15:27 2009
@@ -701,7 +701,7 @@
   tp_channel_get_handle (channel, &handle_type);
 
   if (handle_type != TP_HANDLE_TYPE_ROOM)
-    goto out;
+    return;
 
   chat = EMPATHY_TP_CHAT (
     empathy_dispatch_operation_get_channel_wrapper (operation));
@@ -724,10 +724,6 @@
   g_signal_connect (chat, "destroy",
     G_CALLBACK (chatroom_manager_chat_destroyed_cb),
     manager);
-
-  g_object_unref (chat);
-out:
-  g_object_unref (channel);
 }
 
 void

Modified: trunk/libempathy/empathy-dispatch-operation.c
==============================================================================
--- trunk/libempathy/empathy-dispatch-operation.c	(original)
+++ trunk/libempathy/empathy-dispatch-operation.c	Fri Jan  9 16:15:27 2009
@@ -526,7 +526,7 @@
 
   priv = GET_PRIV (operation);
 
-  return TP_CHANNEL (g_object_ref (priv->channel));
+  return priv->channel;
 }
 
 GObject *
@@ -539,9 +539,6 @@
 
   priv = GET_PRIV (operation);
 
-  if (priv->channel_wrapper != NULL)
-    g_object_ref (priv->channel_wrapper);
-
   return priv->channel_wrapper;
 }
 

Modified: trunk/libempathy/empathy-dispatcher.c
==============================================================================
--- trunk/libempathy/empathy-dispatcher.c	(original)
+++ trunk/libempathy/empathy-dispatcher.c	Fri Jan  9 16:15:27 2009
@@ -118,8 +118,8 @@
 new_dispatch_data (TpChannel *channel, GObject *channel_wrapper)
 {
   DispatchData *d = g_slice_new0 (DispatchData);
-  d->channel = channel;
-  d->channel_wrapper = channel_wrapper;
+  d->channel = g_object_ref (channel);
+  d->channel_wrapper = g_object_ref (channel_wrapper);
 
   return d;
 }

Modified: trunk/libempathy/empathy-tp-chat.c
==============================================================================
--- trunk/libempathy/empathy-tp-chat.c	(original)
+++ trunk/libempathy/empathy-tp-chat.c	Fri Jan  9 16:15:27 2009
@@ -1053,7 +1053,7 @@
 
 	switch (param_id) {
 	case PROP_CHANNEL:
-		priv->channel = g_object_ref (g_value_get_object (value));
+		priv->channel = g_value_dup_object (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -1187,6 +1187,7 @@
 	   We loose the ordering of sent messages though */
 	g_signal_handlers_disconnect_by_func (priv->channel,
 		tp_chat_invalidated_cb, chat);
+
 	tp_cli_channel_call_close (priv->channel, -1, tp_chat_async_cb,
 		"closing channel", NULL, NULL);
 

Modified: trunk/libempathy/empathy-utils.c
==============================================================================
--- trunk/libempathy/empathy-utils.c	(original)
+++ trunk/libempathy/empathy-utils.c	Fri Jan  9 16:15:27 2009
@@ -470,8 +470,6 @@
           empathy_dispatch_operation_get_channel_wrapper (operation));
 
       empathy_tp_call_to (call, contact);
-
-      g_object_unref (call);
     }
 
   g_object_unref (contact);

Modified: trunk/src/empathy-event-manager.c
==============================================================================
--- trunk/src/empathy-event-manager.c	(original)
+++ trunk/src/empathy-event-manager.c	Fri Jan  9 16:15:27 2009
@@ -381,7 +381,6 @@
 
       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_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 @@
         EMPATHY_CONTACT_READY_NAME, event_manager_tube_got_contact_name_cb,
         approval);
 
-      g_object_unref (channel);
       g_object_unref (factory);
       g_object_unref (account);
     }

Modified: trunk/src/empathy-tube-dispatch.c
==============================================================================
--- trunk/src/empathy-tube-dispatch.c	(original)
+++ trunk/src/empathy-tube-dispatch.c	Fri Jan  9 16:15:27 2009
@@ -161,8 +161,6 @@
   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 @@
 
   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 @@
     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 @@
       g_free (msg);
 
       tp_cli_channel_call_close (channel, -1, NULL, NULL, NULL, NULL);
-      g_object_unref (channel);
 
       goto done;
     }

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Fri Jan  9 16:15:27 2009
@@ -102,7 +102,6 @@
 		}
 
 		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 @@
 		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 @@
 		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);
 	}
 }