empathy r2211 - in trunk: libempathy libempathy-gtk src

[xclaesse svn gnome org]

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

Log:
Fix some errors made when rebasing on master

Modified:
   trunk/libempathy-gtk/empathy-new-message-dialog.c
   trunk/libempathy/empathy-dispatcher.c
   trunk/src/empathy-event-manager.c

Modified: trunk/libempathy-gtk/empathy-new-message-dialog.c
==============================================================================
--- trunk/libempathy-gtk/empathy-new-message-dialog.c	(original)
+++ trunk/libempathy-gtk/empathy-new-message-dialog.c	Fri Jan  9 16:16:40 2009
@@ -187,7 +187,7 @@
 		EmpathyContactFactory *factory;
 		EmpathyContact *contact;
 
-		factory = empathy_contact_factory_new ();
+		factory = empathy_contact_factory_dup_singleton ();
 		contact = empathy_contact_factory_get_from_id (factory, account, id);
 		empathy_start_call_with_contact (contact);
 

Modified: trunk/libempathy/empathy-dispatcher.c
==============================================================================
--- trunk/libempathy/empathy-dispatcher.c	(original)
+++ trunk/libempathy/empathy-dispatcher.c	Fri Jan  9 16:16:40 2009
@@ -531,7 +531,7 @@
 
   if (handle_type == TP_CONN_HANDLE_TYPE_CONTACT)
     {
-      EmpathyContactFactory *factory = empathy_contact_factory_new ();
+      EmpathyContactFactory *factory = empathy_contact_factory_dup_singleton ();
       contact = empathy_contact_factory_get_from_handle (factory,
         cd->account, handle);
       g_object_unref (factory);

Modified: trunk/src/empathy-event-manager.c
==============================================================================
--- trunk/src/empathy-event-manager.c	(original)
+++ trunk/src/empathy-event-manager.c	Fri Jan  9 16:16:40 2009
@@ -480,7 +480,7 @@
       if (handle_type != TP_HANDLE_TYPE_CONTACT)
         return;
 
-      factory = empathy_contact_factory_new ();
+      factory = empathy_contact_factory_dup_singleton ();
       account = empathy_channel_get_account (channel);
 
       contact = empathy_contact_factory_get_from_handle (factory, account,