Wed, 23 Apr 2008 10:25:53 +0000
merge of '7ccb529edf3f08fbf5dbe8accba978654f4054c6'
and '48b31ecd153e1bd8a6b396a629d9f0ec2f33aae4'
--- 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;
--- 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);