Mercurial > pidgin

changeset 31931:c87cfdba16c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '06fd8a15a3af927e3ce13b04af6e2159fb537dd9' and 'cd7e0618fa45ee113bac1516e7f907b02c79219a'
author masca@cpw.pidgin.im
date Tue, 23 Aug 2011 03:22:06 +0000
parents e304b1a0b516 (diff) d9c7126086ec (current diff)
children 61ce89013291
files
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkdocklet.c	Mon Aug 22 22:09:55 2011 +0000
+++ b/pidgin/gtkdocklet.c	Tue Aug 23 03:22:06 2011 +0000
@@ -188,7 +188,6 @@
 	for(l = purple_accounts_get_all(); l != NULL; l = l->next) {
 
 		PurpleAccount *account = (PurpleAccount*)l->data;
-		PurpleStatus *account_status;
 
 		if (!purple_account_get_enabled(account, PIDGIN_UI))
 			continue;
@@ -196,7 +195,6 @@
 		if (purple_account_is_disconnected(account))
 			continue;
 
-		account_status = purple_account_get_active_status(account);
 		if (purple_account_is_connecting(account))
 			newconnecting = TRUE;
 	}
--- a/pidgin/gtkutils.c	Mon Aug 22 22:09:55 2011 +0000
+++ b/pidgin/gtkutils.c	Tue Aug 23 03:22:06 2011 +0000
@@ -1290,7 +1290,7 @@
 
 	monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
 
-	push_in = FALSE;
+	*push_in = FALSE;
 
 	/*
 	 * The placement of popup menus horizontally works like this (with