Merge branch 'master' into tp-tube

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

diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 60d8df878e4b4a2439e1c357a3d4f106d6763ee9..66c4514aff7748d7c001aca4048c7fbc3dccf358 100644 (file)
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -128,11 +128,11 @@ contact_manager_invalidated_cb (TpProxy *connection,
 }
 
 static void
-contact_manager_new_connection_cb (EmpathyAccountManager *manager,
+contact_manager_new_connection_cb (EmpathyAccountManager *account_manager,
                                   TpConnection *connection,
                                   EmpathyContactManager *self)
 {
-       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       EmpathyContactManagerPriv *priv = GET_PRIV (self);
        EmpathyTpContactList      *list;
 
        if (g_hash_table_lookup (priv->lists, connection)) {
@@ -146,18 +146,18 @@ contact_manager_new_connection_cb (EmpathyAccountManager *manager,
        g_hash_table_insert (priv->lists, g_object_ref (connection), list);
        g_signal_connect (connection, "invalidated",
                          G_CALLBACK (contact_manager_invalidated_cb),
-                         manager);
+                         self);
 
        /* Connect signals */
        g_signal_connect (list, "members-changed",
                          G_CALLBACK (contact_manager_members_changed_cb),
-                         manager);
+                         self);
        g_signal_connect (list, "pendings-changed",
                          G_CALLBACK (contact_manager_pendings_changed_cb),
-                         manager);
+                         self);
        g_signal_connect (list, "groups-changed",
                          G_CALLBACK (contact_manager_groups_changed_cb),
-                         manager);
+                         self);
 }
 
 static void