Fix warnings from GCC 4.6 about variables that are set but not used.

1 files changed, 2 insertions, 29 deletions

diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index a8dbe6cbc..f6a7a114d 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -453,10 +453,6 @@ contact_list_store_set_property (GObject      *object,
 				 const GValue *value,
 				 GParamSpec   *pspec)
 {
-	EmpathyContactListStorePriv *priv;
-
-	priv = GET_PRIV (object);
-
 	switch (param_id) {
 	case PROP_CONTACT_LIST:
 		contact_list_store_set_contact_list (EMPATHY_CONTACT_LIST_STORE (object),
@@ -932,10 +928,6 @@ contact_list_store_members_changed_cb (EmpathyContactList      *list_iface,
 				       gboolean                 is_member,
 				       EmpathyContactListStore *store)
 {
-	EmpathyContactListStorePriv *priv;
-
-	priv = GET_PRIV (store);
-
 	DEBUG ("Contact %s (%d) %s",
 		empathy_contact_get_id (contact),
 		empathy_contact_get_handle (contact),
@@ -954,10 +946,6 @@ contact_list_store_favourites_changed_cb (EmpathyContactList      *list_iface,
 					  gboolean                 is_favourite,
 					  EmpathyContactListStore *store)
 {
-	EmpathyContactListStorePriv *priv;
-
-	priv = GET_PRIV (store);
-
 	DEBUG ("Contact %s (%d) is %s a favourite",
 		empathy_contact_get_id (contact),
 		empathy_contact_get_handle (contact),
@@ -975,10 +963,6 @@ contact_list_store_member_renamed_cb (EmpathyContactList      *list_iface,
 				      gchar                   *message,
 				      EmpathyContactListStore *store)
 {
-	EmpathyContactListStorePriv *priv;
-
-	priv = GET_PRIV (store);
-
 	DEBUG ("Contact %s (%d) renamed to %s (%d)",
 		empathy_contact_get_id (old_contact),
 		empathy_contact_get_handle (old_contact),
@@ -1124,12 +1108,9 @@ static void
 contact_list_store_remove_contact (EmpathyContactListStore *store,
 				   EmpathyContact          *contact)
 {
-	EmpathyContactListStorePriv *priv;
 	GtkTreeModel               *model;
 	GList                      *iters, *l;
 
-	priv = GET_PRIV (store);
-
 	iters = contact_list_store_find_contact (store, contact);
 	if (!iters) {
 		return;
@@ -1334,11 +1315,9 @@ contact_list_store_contact_set_active (EmpathyContactListStore *store,
 				       gboolean                active,
 				       gboolean                set_changed)
 {
-	EmpathyContactListStorePriv *priv;
 	GtkTreeModel               *model;
 	GList                      *iters, *l;
 
-	priv = GET_PRIV (store);
 	model = GTK_TREE_MODEL (store);
 
 	iters = contact_list_store_find_contact (store, contact);
@@ -1457,14 +1436,11 @@ contact_list_store_get_group (EmpathyContactListStore *store,
 			      gboolean               *created,
 			      gboolean               is_fake_group)
 {
-	EmpathyContactListStorePriv *priv;
 	GtkTreeModel                *model;
 	GtkTreeIter                  iter_group;
 	GtkTreeIter                  iter_separator;
 	FindGroup                    fg;
 
-	priv = GET_PRIV (store);
-
 	memset (&fg, 0, sizeof (fg));
 
 	fg.name = name;
@@ -1637,14 +1613,14 @@ contact_list_store_contact_sort (EmpathyContact *contact_a,
 
 	/* protocol */
 	ret_val = strcmp (tp_account_get_protocol (account_a),
-			  tp_account_get_protocol (account_a));
+			  tp_account_get_protocol (account_b));
 
 	if (ret_val != 0)
 		goto out;
 
 	/* account ID */
 	ret_val = strcmp (tp_proxy_get_object_path (account_a),
-			  tp_proxy_get_object_path (account_a));
+			  tp_proxy_get_object_path (account_b));
 
 out:
 	return ret_val;
@@ -1778,13 +1754,10 @@ static GList *
 contact_list_store_find_contact (EmpathyContactListStore *store,
 				 EmpathyContact          *contact)
 {
-	EmpathyContactListStorePriv *priv;
 	GtkTreeModel              *model;
 	GList                     *l = NULL;
 	FindContact                fc;
 
-	priv = GET_PRIV (store);
-
 	memset (&fc, 0, sizeof (fc));
 
 	fc.contact = contact;