]> git.0d.be Git - empathy.git/commitdiff
empathy-contact-list-store.c: fix shadow declarations
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 21 Oct 2009 14:45:17 +0000 (15:45 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 21 Oct 2009 14:46:28 +0000 (15:46 +0100)
libempathy-gtk/empathy-contact-list-store.c

index 1ef9aef7509a3f29d5a2877d59f91937ddcaafb1..6572b4c908a0e4bd8b683467992441d2d1a6453a 100644 (file)
@@ -889,7 +889,6 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
        }
        /* If no groups just add it at the top level. */
        if (!groups) {
-               GtkTreeIter iter;
                GtkTreeModel *model = GTK_TREE_MODEL (store);
 
                if (gtk_tree_model_get_iter_first (model, &iter)) do {
@@ -1193,19 +1192,19 @@ contact_list_store_contact_set_active (EmpathyContactListStore *store,
 static ShowActiveData *
 contact_list_store_contact_active_new (EmpathyContactListStore *store,
                                       EmpathyContact          *contact,
-                                      gboolean                remove)
+                                      gboolean                remove_)
 {
        ShowActiveData *data;
 
        DEBUG ("Contact:'%s' now active, and %s be removed",
                empathy_contact_get_name (contact),
-               remove ? "WILL" : "WILL NOT");
+               remove_ ? "WILL" : "WILL NOT");
 
        data = g_slice_new0 (ShowActiveData);
 
        data->store = g_object_ref (store);
        data->contact = g_object_ref (contact);
-       data->remove = remove;
+       data->remove = remove_;
 
        return data;
 }