# HG changeset patch # User Sadrul Habib Chowdhury # Date 1208946353 0 # Node ID 32624648b79751eb6f4fbcbc28f8ca63c7279116 # Parent 870a580e8fdefc793cbb4cbad0d8f2c5fd1345de# Parent 72141dd0f8c0a97baf9f5c425886eae9ba9806d6 merge of '95a44af48cc13a9cd6373ef1b011acd7d2b95e98' and 'ab12e5d2a19c73f5053123738b8873072ff0ee5e' diff -r 870a580e8fde -r 32624648b797 finch/libgnt/gntentry.c --- a/finch/libgnt/gntentry.c Wed Apr 23 03:06:49 2008 +0000 +++ b/finch/libgnt/gntentry.c Wed Apr 23 10:25:53 2008 +0000 @@ -238,8 +238,15 @@ destroy_suggest(entry); return FALSE; } else if (count == 1) { + char *store = g_strndup(entry->start, entry->end - entry->start); + gboolean ret; + destroy_suggest(entry); - return complete_suggest(entry, sgst); + complete_suggest(entry, sgst); + + ret = (strncmp(store, entry->start, entry->end - entry->start) != 0); + g_free(store); + return ret; } else { if (max > 0) { GntWidget *ddown = entry->ddown; diff -r 870a580e8fde -r 32624648b797 pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Wed Apr 23 03:06:49 2008 +0000 +++ b/pidgin/gtkstatusbox.c Wed Apr 23 10:25:53 2008 +0000 @@ -1723,6 +1723,8 @@ gtk_cell_view_set_model(GTK_CELL_VIEW(status_box->cell_view), GTK_TREE_MODEL(status_box->store)); gtk_list_store_append(status_box->store, &(status_box->iter)); + atk_object_set_name(gtk_widget_get_accessible(status_box->toggle_button), _("Status Selector")); + gtk_container_add(GTK_CONTAINER(status_box->toggle_button), status_box->hbox); gtk_box_pack_start(GTK_BOX(status_box->hbox), status_box->cell_view, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(status_box->hbox), status_box->vsep, FALSE, FALSE, 0);