diff src/gtkrequest.c @ 7843:9408c12b4a61

[gaim-migrate @ 8497] Change the alias buddy, alias chat, and alias contact dialogs. They're supposed to be more HIG-friendly. They're definitely a bit smaller... I guess that's good? I dunno. I think I'm just not used to them being so small. This was from a patch from Nathan Fredrickson. I changed all the request dialogs so they do not require primary text. I'm not really sure if this is good or not. I dunno. Like, add buddy and add chat both have only small text, and they look ok. committer: Tailor Script <[e-mail]>

--- a/src/gtkrequest.c	Sat Dec 13 02:23:25 2003 +0000
+++ b/src/gtkrequest.c	Sat Dec 13 02:29:23 2003 +0000
@@ -211,6 +211,7 @@
 					   const char *ok_text, GCallback ok_cb,
 					   const char *cancel_text, GCallback cancel_cb,
 					   void *user_data)
+
 {
 	GaimGtkRequestData *data;
 	GtkWidget *dialog;
@@ -266,11 +267,11 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 
 	/* Descriptive label */
-	label_text = g_strdup_printf("<span weight=\"bold\" size=\"larger\">"
-								 "%s</span>%s%s",
-								 primary,
-								 (secondary ? "\n\n" : ""),
-								 (secondary ? secondary : ""));
+	label_text = g_strdup_printf((primary ? "<span weight=\"bold\" size=\"larger\">"
+								 "%s</span>%s%s" : "%s%s%s"),
+								 (primary ? primary : ""),
+								 ((primary && secondary) ? "\n\n" : ""),
+ 								 (secondary ? secondary : ""));
 
 	label = gtk_label_new(NULL);
 
@@ -415,11 +416,11 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 
 	/* Descriptive label */
-	label_text = g_strdup_printf("<span weight=\"bold\" size=\"larger\">"
-								 "%s</span>%s%s",
-								 primary,
-								 (secondary ? "\n\n" : ""),
-								 (secondary ? secondary : ""));
+	label_text = g_strdup_printf((primary ? "<span weight=\"bold\" size=\"larger\">"
+								 "%s</span>%s%s" : "%s%s%s"),
+								 (primary ? primary : ""),
+								 ((primary && secondary) ? "\n\n" : ""),
+ 								 (secondary ? secondary : ""));
 
 	label = gtk_label_new(NULL);
 
@@ -503,11 +504,11 @@
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	if (primary != NULL || secondary != NULL) {
-		label_text = g_strdup_printf("<span weight=\"bold\" size=\"larger\">"
-									 "%s</span>%s%s",
+		label_text = g_strdup_printf((primary ? "<span weight=\"bold\" size=\"larger\">"
+									 "%s</span>%s%s" : "%s%s%s"),
 									 (primary ? primary : ""),
-									 (secondary ? "\n\n" : ""),
-									 (secondary ? secondary : ""));
+									 ((primary && secondary) ? "\n\n" : ""),
+	 								 (secondary ? secondary : ""));
 
 		label = gtk_label_new(NULL);