Merge branch 'debugger'

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

diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 60d8df878e4b4a2439e1c357a3d4f106d6763ee9..073424485405fd9def60d86ac561910a46f48c36 100644 (file)
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
@@ -123,16 +123,16 @@ contact_manager_invalidated_cb (TpProxy *connection,
        list = g_hash_table_lookup (priv->lists, connection);
        if (list) {
                empathy_tp_contact_list_remove_all (list);
-               g_hash_table_remove (priv->lists, connection);          
+               g_hash_table_remove (priv->lists, 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
@@ -499,7 +499,7 @@ contact_manager_remove_group (EmpathyContactList *manager,
                              const gchar *group)
 {
        EmpathyContactManagerPriv *priv = GET_PRIV (manager);
-       
+
        g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
 
        g_hash_table_foreach (priv->lists,
@@ -529,7 +529,7 @@ empathy_contact_manager_can_add (EmpathyContactManager *manager,
 {
        EmpathyContactManagerPriv *priv = GET_PRIV (manager);
        EmpathyTpContactList      *list;
-       
+
        g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), FALSE);
 
        list = g_hash_table_lookup (priv->lists, connection);