Mercurial > pidgin.yaz
diff pidgin/gtkstatusbox.c @ 16346:bf353c85959a
merge of '05f7badcad9471084218e698a5c011908d17af90'
and '88066f9b13ceb09d6de93a2d30d8e49a6840fdf9'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 24 Apr 2007 03:56:03 +0000 |
| parents | 6b4e778ee4b4 89328a54948b |
| children | 72dc611f3257 0fb719b5dc0e |
line wrap: on
line diff
--- a/pidgin/gtkstatusbox.c Mon Apr 23 17:19:11 2007 +0000 +++ b/pidgin/gtkstatusbox.c Tue Apr 24 03:56:03 2007 +0000 @@ -1513,7 +1513,6 @@ gtk_tree_row_reference_free(status_box->active_row); status_box->active_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(status_box->dropdown_store), path); - pidgin_status_box_popdown (status_box); pidgin_status_box_changed(status_box); } @@ -2389,7 +2388,7 @@ if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(status_box))) { - if (type == PIDGIN_STATUS_BOX_TYPE_POPULAR) + if (type == PIDGIN_STATUS_BOX_TYPE_POPULAR || type == PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR) { PurpleSavedStatus *saved; saved = purple_savedstatus_find_by_creation_time(GPOINTER_TO_INT(data));