Mercurial > pidgin.yaz
changeset 24633:0ac34748464a
merge of '17b584b23aee26cc5553b12483ab9b550eee8103'
and '2b3429067be9bc2eb9be9e8deeeac9c35001f61d'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Thu, 11 Dec 2008 06:24:14 +0000 |
| parents | 8792c97479fd (diff) 662fdd4836aa (current diff) |
| children | 79da937ac0f1 |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkutils.c Thu Dec 11 04:20:14 2008 +0000 +++ b/pidgin/gtkutils.c Thu Dec 11 06:24:14 2008 +0000 @@ -3276,13 +3276,7 @@ static void combo_box_changed_cb(GtkComboBox *combo_box, GtkEntry *entry) { -#if GTK_CHECK_VERSION(2, 6, 0) char *text = gtk_combo_box_get_active_text(combo_box); -#else - GtkWidget *widget = gtk_bin_get_child(GTK_BIN(combo_box)); - char *text = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); -#endif - gtk_entry_set_text(entry, text ? text : ""); g_free(text); }