aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-contact-list-store.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-21 22:45:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-21 22:46:28 +0800
commit167595e8a0108f2763949b6a1188dafcf99f276d (patch)
tree6bc914ebd95840cf49ee51de5d9a30e6009067d0 /libempathy-gtk/empathy-contact-list-store.c
parenta94bffadcc27ac011a8b5d8472d907f23c129955 (diff)
downloadgsoc2013-empathy-167595e8a0108f2763949b6a1188dafcf99f276d.tar
gsoc2013-empathy-167595e8a0108f2763949b6a1188dafcf99f276d.tar.gz
gsoc2013-empathy-167595e8a0108f2763949b6a1188dafcf99f276d.tar.bz2
gsoc2013-empathy-167595e8a0108f2763949b6a1188dafcf99f276d.tar.lz
gsoc2013-empathy-167595e8a0108f2763949b6a1188dafcf99f276d.tar.xz
gsoc2013-empathy-167595e8a0108f2763949b6a1188dafcf99f276d.tar.zst
gsoc2013-empathy-167595e8a0108f2763949b6a1188dafcf99f276d.zip
empathy-contact-list-store.c: fix shadow declarations
Diffstat (limited to 'libempathy-gtk/empathy-contact-list-store.c')
-rw-r--r--libempathy-gtk/empathy-contact-list-store.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 1ef9aef75..6572b4c90 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -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;
}