Mercurial > pidgin.yaz
diff pidgin/gtkutils.c @ 31628:6448e3f3ddd4
merge of '8f2d6c5138602b96aef4fbfbc5b47c202951201b'
and 'e8c1e8a79ad64bd73663a15cc0e802b06a8bc733'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Wed, 02 Feb 2011 06:26:19 +0000 |
| parents | 3cec1e97e698 |
| children | fa88dc1dcabb d72d728226dc |
line wrap: on
line diff
--- a/pidgin/gtkutils.c Wed Feb 02 05:51:09 2011 +0000 +++ b/pidgin/gtkutils.c Wed Feb 02 06:26:19 2011 +0000 @@ -2924,7 +2924,7 @@ GtkComboBox *ret = NULL; GtkWidget *the_entry = NULL; - ret = GTK_COMBO_BOX(gtk_combo_box_new_text()); + ret = GTK_COMBO_BOX(gtk_combo_box_entry_new_text()); the_entry = gtk_entry_new(); gtk_container_add(GTK_CONTAINER(ret), the_entry);