Fix some errors made when rebasing on master

svn path=/trunk/; revision=2211

diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 766087812a0a2c72c85b366595f2ccafe09d9df6..d0d99bc3e94bf68294c20d8421e889d42849f5ec 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -187,7 +187,7 @@ new_message_dialog_response_cb (GtkWidget               *widget,
                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);
 

diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 3728a45d2e0b14e893ff6e9357001b688d018d1a..711d7c854bea429a82229dd8be2558e8e3263eac 100644 (file)
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -531,7 +531,7 @@ dispatcher_connection_new_channel (EmpathyDispatcher *dispatcher,
 
   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);

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 0b42cb1096cf6e9bc3f6ed52d95f9206de59bfde..8a613039bfc4156dc18022254abbd43a07459228 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -480,7 +480,7 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher,
       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,