Merge branch 'gnome-3-8'

[empathy.git] / libempathy / empathy-presence-manager.c

diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index 9b1a39217df1e14eda9981866598471b50df10a6..1c288fb98c9c47d8e702868b574dd4e4877195d3 100644 (file)
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -19,18 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-presence-manager.h"
 
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-#include <dbus/dbus-glib.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
@@ -433,13 +423,13 @@ account_manager_ready_cb (GObject *source_object,
   most_available_presence_changed (account_manager, state, status,
     status_message, self);
 
-  accounts = tp_account_manager_get_valid_accounts (self->priv->manager);
+  accounts = tp_account_manager_dup_valid_accounts (self->priv->manager);
   for (l = accounts; l != NULL; l = l->next)
     {
       tp_g_signal_connect_object (l->data, "status-changed",
           G_CALLBACK (account_status_changed_cb), self, 0);
     }
-  g_list_free (accounts);
+  g_list_free_full (accounts, g_object_unref);
 
   g_free (status);
   g_free (status_message);