[Gaim-commits] CVS: gaim/src gtkrequest.c,1.61,1.62 request.c,1.27,1.28

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6024/src

Modified Files:
	gtkrequest.c request.c 
Log Message:
Minor tweaks to the list box in the multi-field request dialogs so they
work without a label and scrollbar (Pekka Riikonen)


Index: gtkrequest.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -p -r1.61 -r1.62
--- gtkrequest.c	23 Feb 2004 22:43:43 -0000	1.61
+++ gtkrequest.c	25 Feb 2004 19:34:26 -0000	1.62
@@ -903,8 +903,8 @@ create_list_field(GaimRequestField *fiel
 	/* 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 @@ gaim_gtk_request_fields(const char *titl
 
 				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;
 

Index: request.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/request.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -p -r1.27 -r1.28
--- request.c	19 Feb 2004 07:25:31 -0000	1.27
+++ request.c	25 Feb 2004 19:34:26 -0000	1.28
@@ -806,7 +806,6 @@ gaim_request_field_list_new(const char *
 	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);