changeset
merge of '9df72c991fbc95562f1b6a69fbe43a44fa08d991'
Tue, 23 Aug 2011 03:22:06 +0000
- author
- Jorge Villaseñor <masca@cpw.pidgin.im>
- date
- Tue, 23 Aug 2011 03:22:06 +0000
- changeset 32214
- 12ab437834cf
- parent 32213
- 9df72c991fbc (diff)
- parent 32211
- b46aa64aa1fb (current diff)
- child 32215
- 0a4e72c8a67e
merge of '9df72c991fbc95562f1b6a69fbe43a44fa08d991'
and 'b46aa64aa1fba77c847b5c5a2da84cc2c3038f61'
--- 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
