[empathy] Fix left over issues from rebasing



commit d03890164e921182268c5f34aeb44b93a51b35c6
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date:   Tue Apr 7 14:38:04 2009 -0400

    Fix left over issues from rebasing
---
 libempathy-gtk/empathy-location-manager.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index de772c7..987574b 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -39,7 +39,7 @@
 #include "libempathy/empathy-account-manager.h"
 #include "libempathy/empathy-enum-types.h"
 #include "libempathy/empathy-location.h"
-#include "libempathy/empathy-contact-factory.h"
+#include "libempathy/empathy-tp-contact-factory.h"
 #include "libempathy/empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
@@ -116,10 +116,14 @@ publish_location (EmpathyLocationManager *location_manager,
   guint connection_status = -1;
   gboolean can_publish;
   EmpathyConf *conf = empathy_conf_get ();
-  EmpathyContactFactory *factory = empathy_contact_factory_dup_singleton ();
+  TpConnection *conn;
+  EmpathyTpContactFactory *factory;
 
   priv = GET_PRIV (location_manager);
 
+  conn = mission_control_get_tpconnection (priv->mc, account, NULL);
+  factory = empathy_tp_contact_factory_dup_singleton (conn);
+
   if (force_publication == FALSE)
     {
       if (!empathy_conf_get_bool (conf, EMPATHY_PREFS_LOCATION_PUBLISH,
@@ -139,7 +143,8 @@ publish_location (EmpathyLocationManager *location_manager,
   DEBUG ("Publishing location to account %s",
       mc_account_get_display_name (account));
 
-  empathy_contact_factory_set_location (factory, account, priv->location);
+  empathy_tp_contact_factory_set_location (factory, priv->location);
+  g_object_unref (factory);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]