# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1296627979 0
# Node ID c7737916ec11f06833800adbd3ef6ae2990611e0
# Parent  c47def35b00898a6cc3769938c553d7f25b9bce9# Parent  9946314200baf9a6490ce566a6feca630d09fede
merge of 'c47def35b00898a6cc3769938c553d7f25b9bce9'
     and '9946314200baf9a6490ce566a6feca630d09fede'

diff -r c47def35b008 -r c7737916ec11 COPYRIGHT
--- a/COPYRIGHT	Wed Feb 02 05:51:09 2011 +0000
+++ b/COPYRIGHT	Wed Feb 02 06:26:19 2011 +0000
@@ -379,6 +379,7 @@
 Riley Patterson
 Havoc Pennington
 Ted Percival
+Hugo Pereira Da Costa
 Eduardo Pérez
 Matt Perry
 Ani Peter
diff -r c47def35b008 -r c7737916ec11 ChangeLog
--- a/ChangeLog	Wed Feb 02 05:51:09 2011 +0000
+++ b/ChangeLog	Wed Feb 02 06:26:19 2011 +0000
@@ -38,6 +38,8 @@
 	  the conversation window.  (Ryan Flegel) (#13127)
 	* Fix a few memory leaks. (Nader Morshed) (#13162)
 	* Support rendering strikethrough when received as in-line CSS. (#13168)
+	* Editable comboboxes are now more friendly to some GTK+ themes. (Hugo
+	  Pereira Da Costa) (#13164).
 
 	Plugins:
 	* The Voice/Video Settings plugin no longer resets selected devices to
diff -r c47def35b008 -r c7737916ec11 pidgin/gtkutils.c
--- 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);