[empathy] empathy-contact-list-store.c: fix shadow declarations
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy] empathy-contact-list-store.c: fix shadow declarations
- Date: Wed, 21 Oct 2009 15:02:22 +0000 (UTC)
commit 167595e8a0108f2763949b6a1188dafcf99f276d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Oct 21 15:45:17 2009 +0100
empathy-contact-list-store.c: fix shadow declarations
libempathy-gtk/empathy-contact-list-store.c | 7 +++----
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 1ef9aef..6572b4c 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]