comparison 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
comparison
equal deleted inserted replaced
31625:53096ba34fe6 31628:6448e3f3ddd4
2922 pidgin_text_combo_box_entry_new(const char *default_item, GList *items) 2922 pidgin_text_combo_box_entry_new(const char *default_item, GList *items)
2923 { 2923 {
2924 GtkComboBox *ret = NULL; 2924 GtkComboBox *ret = NULL;
2925 GtkWidget *the_entry = NULL; 2925 GtkWidget *the_entry = NULL;
2926 2926
2927 ret = GTK_COMBO_BOX(gtk_combo_box_new_text()); 2927 ret = GTK_COMBO_BOX(gtk_combo_box_entry_new_text());
2928 the_entry = gtk_entry_new(); 2928 the_entry = gtk_entry_new();
2929 gtk_container_add(GTK_CONTAINER(ret), the_entry); 2929 gtk_container_add(GTK_CONTAINER(ret), the_entry);
2930 2930
2931 if (default_item) 2931 if (default_item)
2932 gtk_entry_set_text(GTK_ENTRY(the_entry), default_item); 2932 gtk_entry_set_text(GTK_ENTRY(the_entry), default_item);