empathy r1227 - in trunk: libempathy src

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Jul 14 09:26:03 2008
New Revision: 1227
URL: http://svn.gnome.org/viewvc/empathy?rev=1227&view=rev

Log:
Merge branch 'leak'


Modified:
   trunk/libempathy/empathy-tp-contact-factory.c
   trunk/src/empathy.c

Modified: trunk/libempathy/empathy-tp-contact-factory.c
==============================================================================
--- trunk/libempathy/empathy-tp-contact-factory.c	(original)
+++ trunk/libempathy/empathy-tp-contact-factory.c	Mon Jul 14 09:26:03 2008
@@ -1051,6 +1051,8 @@
 		tp_contact_factory_request_everything (tp_factory, new_handles);
 	}
 
+	g_array_free (new_handles, TRUE);
+
 	return contacts;
 }
 

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Mon Jul 14 09:26:03 2008
@@ -100,6 +100,8 @@
 	else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
 		empathy_call_window_new (channel);
 	}
+
+	g_free (channel_type);
 }
 
 static void