# HG changeset patch # User Kevin Stange # Date 1177365688 0 # Node ID d5515274e38b0f154687c527bd2df0c00ba223a9 # Parent 89328a54948bc5e6a0b2a1951751705bd03e5d3e# Parent 836c571de05311e951c57e2e3b78d9bfe08eea3a merge of 'ba1eb6457e947b8ab1bd5a6e3652e1e0a05bbd9c' and 'bf580a2b08c524624f4aea0b99c887391d92a428' diff -r 836c571de053 -r d5515274e38b libpurple/plugins/mono/api/Makefile.am diff -r 836c571de053 -r d5515274e38b libpurple/plugins/mono/loader/Makefile.am diff -r 836c571de053 -r d5515274e38b pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Mon Apr 23 22:00:21 2007 +0000 +++ b/pidgin/gtkstatusbox.c Mon Apr 23 22:01:28 2007 +0000 @@ -1511,7 +1511,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); } @@ -2387,7 +2386,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));