changeset 31628:6448e3f3ddd4

merge of '8f2d6c5138602b96aef4fbfbc5b47c202951201b' and 'e8c1e8a79ad64bd73663a15cc0e802b06a8bc733'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Wed, 02 Feb 2011 06:26:19 +0000
parents 53096ba34fe6 (current diff) 5ac05ae49c5c (diff)
children 11be48c38c19
files ChangeLog
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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);