# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1077737666 0
# Node ID f4a878d48254fad2d5f4f6ce8fab0e2b2e4dc91b
# Parent  19c664c54ce599ac8b51184de01af74af231ed4c
[gaim-migrate @ 9056]
Minor tweaks to the list box in the multi-field request dialogs so they
work without a label and scrollbar (Pekka Riikonen)

committer: Tailor Script <tailor@pidgin.im>

diff -r 19c664c54ce5 -r f4a878d48254 COPYRIGHT
--- a/COPYRIGHT	Wed Feb 25 05:29:04 2004 +0000
+++ b/COPYRIGHT	Wed Feb 25 19:34:26 2004 +0000
@@ -93,6 +93,7 @@
 David Raeman
 Etan Reisner
 Kristian Rietveld
+Pekka Riikonen
 Tim Ringenbach
 Andrew Rodland
 Neil Sanchala
diff -r 19c664c54ce5 -r f4a878d48254 ChangeLog
--- a/ChangeLog	Wed Feb 25 05:29:04 2004 +0000
+++ b/ChangeLog	Wed Feb 25 19:34:26 2004 +0000
@@ -38,6 +38,8 @@
 	* Conversation placement by account now works correctly with both
 	  chats and IMs, and takes the Combine Chats and IMs option into
 	  consideration.
+	* Minor tweaks to the list box in the multi-field request dialogs
+	  so they work without a label and scrollbar (Pekka Riikonen)
 	* The Disconnect dialog no longer raises and gains focus each time
 	  a disconnected account is added (Ka-Hing Cheung)
 	* Added new MSN error codes and fixed an incorrect one (Stu Tomlinson)
diff -r 19c664c54ce5 -r f4a878d48254 src/gtkrequest.c
--- a/src/gtkrequest.c	Wed Feb 25 05:29:04 2004 +0000
+++ b/src/gtkrequest.c	Wed Feb 25 19:34:26 2004 +0000
@@ -903,8 +903,8 @@
 	/* Create the scrolled window */
 	sw = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-								   GTK_POLICY_AUTOMATIC,
-								   GTK_POLICY_ALWAYS);
+				       GTK_POLICY_AUTOMATIC,
+				       GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
 										GTK_SHADOW_IN);
 	gtk_widget_show(sw);
@@ -1134,7 +1134,8 @@
 
 				type = gaim_request_field_get_type(field);
 
-				if (type != GAIM_REQUEST_FIELD_BOOLEAN)
+				if (type != GAIM_REQUEST_FIELD_BOOLEAN &&
+				    gaim_request_field_get_label(field))
 				{
 					char *text;
 
diff -r 19c664c54ce5 -r f4a878d48254 src/request.c
--- a/src/request.c	Wed Feb 25 05:29:04 2004 +0000
+++ b/src/request.c	Wed Feb 25 19:34:26 2004 +0000
@@ -806,7 +806,6 @@
 	GaimRequestField *field;
 
 	g_return_val_if_fail(id   != NULL, NULL);
-	g_return_val_if_fail(text != NULL, NULL);
 
 	field = gaim_request_field_new(id, text, GAIM_REQUEST_FIELD_LIST);