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

22 files changed, 5 insertions, 166 deletions

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 10ca143d2..71baba483 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -284,10 +284,6 @@ account_chooser_set_property (GObject      *object,
 			      const GValue *value,
 			      GParamSpec   *pspec)
 {
-	EmpathyAccountChooserPriv *priv;
-
-	priv = GET_PRIV (object);
-
 	switch (param_id) {
 	case PROP_HAS_ALL_OPTION:
 		empathy_account_chooser_set_has_all_option (EMPATHY_ACCOUNT_CHOOSER (object),
@@ -329,15 +325,12 @@ empathy_account_chooser_new (void)
 TpAccount *
 empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser)
 {
-	EmpathyAccountChooserPriv *priv;
 	TpAccount                 *account;
 	GtkTreeModel             *model;
 	GtkTreeIter               iter;
 
 	g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), NULL);
 
-	priv = GET_PRIV (chooser);
-
 	model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser));
 	if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (chooser), &iter)) {
 		return NULL;
@@ -362,14 +355,11 @@ empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser)
 TpConnection *
 empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser)
 {
-	EmpathyAccountChooserPriv *priv;
 	TpAccount                 *account;
 	TpConnection              *connection;
 
 	g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), NULL);
 
-	priv = GET_PRIV (chooser);
-
 	account = empathy_account_chooser_dup_account (chooser);
 
 	/* if the returned account is NULL, then the account manager probably
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 3f3427981..c8a401f17 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -59,9 +59,6 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
 {
   const gchar *nick = NULL;
   const gchar *fullname = NULL;
-  gint port = 6667;
-  const gchar *charset;
-  gboolean ssl = FALSE;
   EmpathyAccountSettings *ac_settings;
 
   g_object_get (settings->self, "settings", &ac_settings, NULL);
@@ -69,9 +66,6 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
   nick = empathy_account_settings_get_string (ac_settings, "account");
   fullname = empathy_account_settings_get_string (ac_settings,
       "fullname");
-  charset = empathy_account_settings_get_string (ac_settings, "charset");
-  port = empathy_account_settings_get_uint32 (ac_settings, "port");
-  ssl = empathy_account_settings_get_boolean (ac_settings, "use-ssl");
 
   if (!nick)
     {
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 98bb44614..562961a3b 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -725,11 +725,8 @@ avatar_chooser_drag_motion_cb (GtkWidget          *widget,
 			      guint               time_,
 			      EmpathyAvatarChooser *chooser)
 {
-	EmpathyAvatarChooserPriv *priv;
 	GList                  *p;
 
-	priv = GET_PRIV (chooser);
-
 	for (p = gdk_drag_context_list_targets (context); p != NULL;
 	     p = p->next) {
 		gchar *possible_type;
@@ -765,11 +762,8 @@ avatar_chooser_drag_drop_cb (GtkWidget          *widget,
 			    guint               time_,
 			    EmpathyAvatarChooser *chooser)
 {
-	EmpathyAvatarChooserPriv *priv;
 	GList                  *p;
 
-	priv = GET_PRIV (chooser);
-
 	if (gdk_drag_context_list_targets (context) == NULL) {
 		return FALSE;
 	}
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index 53588d6fc..a38a0a5fb 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -204,10 +204,6 @@ empathy_cell_renderer_expander_set_property (GObject      *object,
 static void
 empathy_cell_renderer_expander_finalize (GObject *object)
 {
-	EmpathyCellRendererExpanderPriv *priv;
-
-	priv = GET_PRIV (object);
-
 	(* G_OBJECT_CLASS (empathy_cell_renderer_expander_parent_class)->finalize) (object);
 }
 
@@ -321,11 +317,9 @@ empathy_cell_renderer_expander_activate (GtkCellRenderer      *cell,
 					const GdkRectangle   *cell_area,
 					GtkCellRendererState  flags)
 {
-	EmpathyCellRendererExpander     *expander;
 	EmpathyCellRendererExpanderPriv *priv;
 	GtkTreePath                    *path;
 
-	expander = EMPATHY_CELL_RENDERER_EXPANDER (cell);
 	priv = GET_PRIV (cell);
 
 	if (!GTK_IS_TREE_VIEW (widget) || !priv->activatable)
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 6bcaa84bc..867200b0c 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -277,13 +277,10 @@ chat_new_connection_cb (TpAccount   *account,
 			EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
-	TpConnection *connection;
 
 	if (new_status != TP_CONNECTION_STATUS_CONNECTED)
 		return;
 
-	connection = tp_account_get_connection (account);
-
 	if (priv->tp_chat != NULL || account != priv->account ||
 	    priv->handle_type == TP_HANDLE_TYPE_NONE ||
 	    EMP_STR_EMPTY (priv->id))
@@ -961,11 +958,8 @@ static void
 chat_command_help (EmpathyChat *chat,
 		   GStrv        strv)
 {
-	EmpathyChatPriv *priv;
 	guint i;
 
-	priv = GET_PRIV (chat);
-
 	/* If <command> part is not defined,
 	 * strv[1] will be the terminal NULL */
 	if (strv[1] == NULL) {
@@ -1134,13 +1128,10 @@ chat_send (EmpathyChat  *chat,
 static void
 chat_input_text_view_send (EmpathyChat *chat)
 {
-	EmpathyChatPriv *priv;
 	GtkTextBuffer  *buffer;
 	GtkTextIter     start, end;
 	gchar	       *msg;
 
-	priv = GET_PRIV (chat);
-
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
 
 	gtk_text_buffer_get_bounds (buffer, &start, &end);
@@ -1995,7 +1986,6 @@ chat_input_populate_popup_cb (GtkTextView *view,
 			      GtkMenu     *menu,
 			      EmpathyChat *chat)
 {
-	EmpathyChatPriv      *priv;
 	GtkTextBuffer        *buffer;
 	GtkTextTagTable      *table;
 	GtkTextTag           *tag;
@@ -2010,7 +2000,6 @@ chat_input_populate_popup_cb (GtkTextView *view,
 	GtkWidget            *smiley_menu;
 	GtkWidget            *image;
 
-	priv = GET_PRIV (chat);
 	buffer = gtk_text_view_get_buffer (view);
 
 	/* Add the emoticon menu. */
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;
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 608611a02..0b7cabd91 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -396,7 +396,6 @@ contact_list_view_contact_drag_received (GtkWidget         *view,
 	const gchar   *contact_id = NULL;
 	gchar         *new_group = NULL;
 	gchar         *old_group = NULL;
-	gboolean       success = TRUE;
 	gboolean       new_group_is_fake, old_group_is_fake = TRUE;
 
 	priv = GET_PRIV (view);
@@ -440,7 +439,6 @@ contact_list_view_contact_drag_received (GtkWidget         *view,
 
 	if (!connection) {
 		DEBUG ("Failed to get connection for account '%s'", account_id);
-		success = FALSE;
 		g_free (new_group);
 		g_free (old_group);
 		g_object_unref (account_manager);
@@ -1886,7 +1884,6 @@ empathy_contact_list_view_new (EmpathyContactListStore        *store,
 EmpathyContact *
 empathy_contact_list_view_dup_selected (EmpathyContactListView *view)
 {
-	EmpathyContactListViewPriv *priv;
 	GtkTreeSelection          *selection;
 	GtkTreeIter                iter;
 	GtkTreeModel              *model;
@@ -1894,8 +1891,6 @@ empathy_contact_list_view_dup_selected (EmpathyContactListView *view)
 
 	g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
 
-	priv = GET_PRIV (view);
-
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
 	if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		return NULL;
@@ -1911,7 +1906,6 @@ empathy_contact_list_view_dup_selected (EmpathyContactListView *view)
 EmpathyContactListFlags
 empathy_contact_list_view_get_flags (EmpathyContactListView *view)
 {
-	EmpathyContactListViewPriv *priv;
 	GtkTreeSelection          *selection;
 	GtkTreeIter                iter;
 	GtkTreeModel              *model;
@@ -1919,8 +1913,6 @@ empathy_contact_list_view_get_flags (EmpathyContactListView *view)
 
 	g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), 0);
 
-	priv = GET_PRIV (view);
-
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
 	if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		return 0;
@@ -1937,7 +1929,6 @@ gchar *
 empathy_contact_list_view_get_selected_group (EmpathyContactListView *view,
 					      gboolean *is_fake_group)
 {
-	EmpathyContactListViewPriv *priv;
 	GtkTreeSelection          *selection;
 	GtkTreeIter                iter;
 	GtkTreeModel              *model;
@@ -1947,8 +1938,6 @@ empathy_contact_list_view_get_selected_group (EmpathyContactListView *view,
 
 	g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
 
-	priv = GET_PRIV (view);
-
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
 	if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		return NULL;
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index fee9f8fdb..68e7efd09 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -468,10 +468,6 @@ set_property (GObject *object,
     const GValue *value,
     GParamSpec *pspec)
 {
-  EmpathyGroupsWidgetPriv *priv;
-
-  priv = GET_PRIV (object);
-
   switch (param_id)
     {
       case PROP_GROUP_DETAILS:
diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
index 3aee55d78..a291a6dee 100644
--- a/libempathy-gtk/empathy-individual-linker.c
+++ b/libempathy-gtk/empathy-individual-linker.c
@@ -526,10 +526,6 @@ set_property (GObject *object,
     const GValue *value,
     GParamSpec *pspec)
 {
-  EmpathyIndividualLinkerPriv *priv;
-
-  priv = GET_PRIV (object);
-
   switch (param_id)
     {
       case PROP_START_INDIVIDUAL:
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index b95da2b47..735e2db9d 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -250,14 +250,11 @@ individual_store_get_group (EmpathyIndividualStore *self,
     gboolean *created,
     gboolean is_fake_group)
 {
-  EmpathyIndividualStorePriv *priv;
   GtkTreeModel *model;
   GtkTreeIter iter_group;
   GtkTreeIter iter_separator;
   FindGroup fg;
 
-  priv = GET_PRIV (self);
-
   memset (&fg, 0, sizeof (fg));
 
   fg.name = name;
@@ -341,13 +338,10 @@ static GList *
 individual_store_find_contact (EmpathyIndividualStore *self,
     FolksIndividual *individual)
 {
-  EmpathyIndividualStorePriv *priv;
   GtkTreeModel *model;
   GList *l = NULL;
   FindContact fc;
 
-  priv = GET_PRIV (self);
-
   memset (&fc, 0, sizeof (fc));
 
   fc.individual = individual;
@@ -373,12 +367,9 @@ static void
 individual_store_remove_individual (EmpathyIndividualStore *self,
     FolksIndividual *individual)
 {
-  EmpathyIndividualStorePriv *priv;
   GtkTreeModel *model;
   GList *iters, *l;
 
-  priv = GET_PRIV (self);
-
   iters = individual_store_find_contact (self, individual);
   if (iters == NULL)
     return;
@@ -504,11 +495,9 @@ individual_store_contact_set_active (EmpathyIndividualStore *self,
     gboolean active,
     gboolean set_changed)
 {
-  EmpathyIndividualStorePriv *priv;
   GtkTreeModel *model;
   GList *iters, *l;
 
-  priv = GET_PRIV (self);
   model = GTK_TREE_MODEL (self);
 
   iters = individual_store_find_contact (self, individual);
@@ -995,10 +984,6 @@ individual_store_favourites_changed_cb (EmpathyIndividualManager *manager,
     gboolean is_favourite,
     EmpathyIndividualStore *self)
 {
-  EmpathyIndividualStorePriv *priv;
-
-  priv = GET_PRIV (self);
-
   DEBUG ("Individual %s is %s a favourite",
       folks_individual_get_id (individual),
       is_favourite ? "now" : "no longer");
@@ -1090,10 +1075,6 @@ individual_store_member_renamed_cb (EmpathyIndividualManager *manager,
     const gchar *message,
     EmpathyIndividualStore *self)
 {
-  EmpathyIndividualStorePriv *priv;
-
-  priv = GET_PRIV (self);
-
   DEBUG ("Individual %s renamed to %s",
       folks_individual_get_id (old_individual),
       folks_individual_get_id (new_individual));
@@ -1197,10 +1178,6 @@ individual_store_set_property (GObject *object,
     const GValue *value,
     GParamSpec *pspec)
 {
-  EmpathyIndividualStorePriv *priv;
-
-  priv = GET_PRIV (object);
-
   switch (param_id)
     {
     case PROP_INDIVIDUAL_MANAGER:
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index c66fda6b8..5cd2afacb 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -409,7 +409,6 @@ individual_view_persona_drag_received (GtkWidget *self,
     GtkTreePath *path,
     GtkSelectionData *selection)
 {
-  EmpathyIndividualViewPriv *priv;
   EmpathyIndividualManager *manager = NULL;
   FolksIndividual *individual = NULL;
   FolksPersona *persona = NULL;
@@ -417,8 +416,6 @@ individual_view_persona_drag_received (GtkWidget *self,
   GList *individuals, *l;
   gboolean retval = FALSE;
 
-  priv = GET_PRIV (self);
-
   persona_uid = (const gchar *) gtk_selection_data_get_data (selection);
 
   /* FIXME: This is slow, but the only way to find the Persona we're having
@@ -2216,7 +2213,6 @@ empathy_individual_view_new (EmpathyIndividualStore *store,
 FolksIndividual *
 empathy_individual_view_dup_selected (EmpathyIndividualView *view)
 {
-  EmpathyIndividualViewPriv *priv;
   GtkTreeSelection *selection;
   GtkTreeIter iter;
   GtkTreeModel *model;
@@ -2224,8 +2220,6 @@ empathy_individual_view_dup_selected (EmpathyIndividualView *view)
 
   g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), NULL);
 
-  priv = GET_PRIV (view);
-
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
   if (!gtk_tree_selection_get_selected (selection, &model, &iter))
     return NULL;
@@ -2240,7 +2234,6 @@ static gchar *
 empathy_individual_view_dup_selected_group (EmpathyIndividualView *view,
     gboolean *is_fake_group)
 {
-  EmpathyIndividualViewPriv *priv;
   GtkTreeSelection *selection;
   GtkTreeIter iter;
   GtkTreeModel *model;
@@ -2250,8 +2243,6 @@ empathy_individual_view_dup_selected_group (EmpathyIndividualView *view,
 
   g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), NULL);
 
-  priv = GET_PRIV (view);
-
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
   if (!gtk_tree_selection_get_selected (selection, &model, &iter))
     return NULL;
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 7c878ce06..0f91bf9f3 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -215,7 +215,6 @@ empathy_log_window_show (TpAccount  *account,
 			gboolean     is_chatroom,
 			GtkWindow   *parent)
 {
-	EmpathyAccountChooser   *account_chooser;
 	TpAccountManager        *account_manager;
 	GtkBuilder             *gui;
 	gchar                  *filename;
@@ -299,7 +298,6 @@ empathy_log_window_show (TpAccount  *account,
 
 	/* Account chooser for chats */
 	window->account_chooser_chats = empathy_account_chooser_new ();
-	account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser_chats);
 
 	gtk_box_pack_start (GTK_BOX (window->vbox_chats),
 			    window->account_chooser_chats,
@@ -577,12 +575,10 @@ log_window_find_populate (EmpathyLogWindow *window,
 {
 	GtkTreeView        *view;
 	GtkTreeModel       *model;
-	GtkTreeSelection   *selection;
 	GtkListStore       *store;
 
 	view = GTK_TREE_VIEW (window->treeview_find);
 	model = gtk_tree_view_get_model (view);
-	selection = gtk_tree_view_get_selection (view);
 	store = GTK_LIST_STORE (model);
 
 	empathy_chat_view_clear (window->chatview_find);
diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c
index d0614fd95..75827c572 100644
--- a/libempathy-gtk/empathy-persona-store.c
+++ b/libempathy-gtk/empathy-persona-store.c
@@ -186,12 +186,9 @@ persona_set_active (EmpathyPersonaStore *self,
     gboolean active,
     gboolean set_changed)
 {
-  EmpathyPersonaStorePriv *priv;
   GtkTreePath *path;
   GtkTreeIter iter;
 
-  priv = GET_PRIV (self);
-
   path = find_persona (self, persona);
   if (path == NULL)
     return;
@@ -588,14 +585,14 @@ sort_personas (FolksPersona *persona_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;
diff --git a/libempathy-gtk/empathy-persona-view.c b/libempathy-gtk/empathy-persona-view.c
index a03746538..289f6fac9 100644
--- a/libempathy-gtk/empathy-persona-view.c
+++ b/libempathy-gtk/empathy-persona-view.c
@@ -354,14 +354,11 @@ individual_drag_received (EmpathyPersonaView *self,
     GdkDragContext *context,
     GtkSelectionData *selection)
 {
-  EmpathyPersonaViewPriv *priv;
   EmpathyIndividualManager *manager = NULL;
   FolksIndividual *individual;
   const gchar *individual_id;
   gboolean success = FALSE;
 
-  priv = GET_PRIV (self);
-
   individual_id = (const gchar *) gtk_selection_data_get_data (selection);
   manager = empathy_individual_manager_dup_singleton ();
   individual = empathy_individual_manager_lookup_member (manager,
@@ -410,11 +407,8 @@ drag_motion (GtkWidget *widget,
     guint time_)
 {
   EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget);
-  EmpathyPersonaViewPriv *priv;
   GdkAtom target;
 
-  priv = GET_PRIV (self);
-
   target = gtk_drag_dest_find_target (GTK_WIDGET (self), context, NULL);
 
   if (target == drag_atoms_dest[DND_DRAG_TYPE_INDIVIDUAL_ID])
@@ -452,15 +446,12 @@ drag_data_get (GtkWidget *widget,
     guint time_)
 {
   EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget);
-  EmpathyPersonaViewPriv *priv;
   FolksPersona *persona;
   const gchar *persona_uid;
 
   if (info != DND_DRAG_TYPE_PERSONA_ID)
     return;
 
-  priv = GET_PRIV (self);
-
   persona = empathy_persona_view_dup_selected (self);
   if (persona == NULL)
     return;
@@ -779,7 +770,6 @@ empathy_persona_view_new (EmpathyPersonaStore *store,
 FolksPersona *
 empathy_persona_view_dup_selected (EmpathyPersonaView *self)
 {
-  EmpathyPersonaViewPriv *priv;
   GtkTreeSelection *selection;
   GtkTreeIter iter;
   GtkTreeModel *model;
@@ -787,8 +777,6 @@ empathy_persona_view_dup_selected (EmpathyPersonaView *self)
 
   g_return_val_if_fail (EMPATHY_IS_PERSONA_VIEW (self), NULL);
 
-  priv = GET_PRIV (self);
-
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
   if (!gtk_tree_selection_get_selected (selection, &model, &iter))
     return NULL;
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 2c8a3c871..45dd9da9e 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -482,11 +482,9 @@ presence_chooser_entry_icon_release_cb (EmpathyPresenceChooser *self,
 		mc_set_custom_state (self);
 	}
 	else {
-		PresenceChooserEntryType type;
 		TpConnectionPresenceType state;
 		char *status;
 
-		type = presence_chooser_get_entry_type (self);
 		state = get_state_and_status (self, &status);
 
 		if (!empathy_status_presets_is_valid (state)) {
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 8dbf6afd9..89c6c09ae 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -405,11 +405,10 @@ empathy_avatar_pixbuf_roundify (GdkPixbuf *pixbuf)
 static gboolean
 empathy_gdk_pixbuf_is_opaque (GdkPixbuf *pixbuf)
 {
-	gint width, height, rowstride, i;
+	gint height, rowstride, i;
 	guchar *pixels;
 	guchar *row;
 
-	width = gdk_pixbuf_get_width (pixbuf);
 	height = gdk_pixbuf_get_height (pixbuf);
 	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
 	pixels = gdk_pixbuf_get_pixels (pixbuf);
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 03d720744..02a86861f 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -92,10 +92,8 @@ server_tls_handler_ready_cb (GObject *source,
 {
   EmpathyServerTLSHandler *handler;
   GError *error = NULL;
-  EmpathyAuthFactoryPriv *priv;
   HandlerContextData *data = user_data;
 
-  priv = GET_PRIV (data->self);
   handler = empathy_server_tls_handler_new_finish (res, &error);
 
   if (error != NULL)
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index aea8684a5..dd7ef460e 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -669,13 +669,9 @@ gboolean
 empathy_chatroom_manager_add (EmpathyChatroomManager *manager,
     EmpathyChatroom *chatroom)
 {
-  EmpathyChatroomManagerPriv *priv;
-
   g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), FALSE);
   g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
 
-  priv = GET_PRIV (manager);
-
   /* don't add more than once */
   if (!empathy_chatroom_manager_find (manager,
       empathy_chatroom_get_account (chatroom),
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 5e3784ae7..7e060766f 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -273,10 +273,6 @@ chatroom_set_property (GObject      *object,
 		       const GValue *value,
 		       GParamSpec   *pspec)
 {
-	EmpathyChatroomPriv *priv;
-
-	priv = GET_PRIV (object);
-
 	switch (param_id) {
 	case PROP_ACCOUNT:
 		empathy_chatroom_set_account (EMPATHY_CHATROOM (object),
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 751328e24..1c3f4209e 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -881,11 +881,8 @@ do_hash_job (GIOSchedulerJob *job,
 {
   HashingData *hash_data = user_data;
   gssize bytes_read;
-  EmpathyFTHandlerPriv *priv;
   GError *error = NULL;
 
-  priv = GET_PRIV (hash_data->handler);
-
 again:
   if (hash_data->buffer == NULL)
     hash_data->buffer = g_malloc0 (BUFFER_SIZE);
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 861cfa123..bbd511558 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -500,13 +500,10 @@ gboolean
 empathy_individual_manager_supports_blocking (EmpathyIndividualManager *self,
     FolksIndividual *individual)
 {
-  EmpathyIndividualManagerPriv *priv;
   GList *personas, *l;
 
   g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self), FALSE);
 
-  priv = GET_PRIV (self);
-
   personas = folks_individual_get_personas (individual);
 
   for (l = personas; l != NULL; l = l->next)
@@ -537,13 +534,10 @@ empathy_individual_manager_set_blocked (EmpathyIndividualManager *self,
     gboolean blocked,
     gboolean abusive)
 {
-  EmpathyIndividualManagerPriv *priv;
   GList *personas, *l;
 
   g_return_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self));
 
-  priv = GET_PRIV (self);
-
   personas = folks_individual_get_personas (individual);
 
   for (l = personas; l != NULL; l = l->next)
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index 691c05df5..6d7ff1c3d 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -617,14 +617,11 @@ irc_network_manager_file_parse (EmpathyIrcNetworkManager *self,
                                 const gchar *filename,
                                 gboolean user_defined)
 {
-  EmpathyIrcNetworkManagerPriv *priv;
   xmlParserCtxtPtr ctxt;
   xmlDocPtr doc;
   xmlNodePtr networks;
   xmlNodePtr node;
 
-  priv = GET_PRIV (self);
-
   DEBUG ("Attempting to parse file:'%s'...", filename);
 
   ctxt = xmlNewParserCtxt ();