# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1064879255 0
# Node ID 9f2285b667a7f7a88b0c23c5f63d3f7584ca196e
# Parent  1ab06a680ac2753a4f383e967875398f8bc47b93
[gaim-migrate @ 7602]
I never learned to read filenames or function names.

committer: Tailor Script <tailor@pidgin.im>

diff -r 1ab06a680ac2 -r 9f2285b667a7 src/gtknotify.c
--- a/src/gtknotify.c	Mon Sep 29 23:46:28 2003 +0000
+++ b/src/gtknotify.c	Mon Sep 29 23:47:35 2003 +0000
@@ -287,8 +287,10 @@
 
 	/* Setup the descriptive label */
 	g_snprintf(label_text, sizeof(label_text),
-		   "<span weight=\"bold\" size=\"larger\">%s</span>\n%s",
-		   primary, (secondary ? secondary : ""));
+		   "<span weight=\"bold\" size=\"larger\">%s</span>%s%s",
+		   primary,
+		   (secondary ? "\n" : ""),
+		   (secondary ? secondary : ""));
 
 	label = gtk_label_new(NULL);
 
diff -r 1ab06a680ac2 -r 9f2285b667a7 src/gtkrequest.c
--- a/src/gtkrequest.c	Mon Sep 29 23:46:28 2003 +0000
+++ b/src/gtkrequest.c	Mon Sep 29 23:47:35 2003 +0000
@@ -488,9 +488,8 @@
 
 	if (primary != NULL || secondary != NULL) {
 		label_text = g_strdup_printf("<span weight=\"bold\" size=\"larger\">"
-									 "%s</span>%s%s",
+									 "%s</span>\n\n%s",
 									 (primary ? primary : ""),
-									 (secondary ? "\n\n" : ""),
 									 (secondary ? secondary : ""));
 
 		label = gtk_label_new(NULL);