# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1038319991 0
# Node ID 9178da61c19fcbc7174ec0642325c810eb844992
# Parent  4f03d0c4fb4d48e90e67145713eb5c8392531d26
[gaim-migrate @ 4201]
fix bug where logging in to yahoo causes a blank new mail notification (thanks ZuperDee and faceprint)

committer: Tailor Script <tailor@pidgin.im>

diff -r 4f03d0c4fb4d -r 9178da61c19f .todo
--- a/.todo	Mon Nov 25 23:44:20 2002 +0000
+++ b/.todo	Tue Nov 26 14:13:11 2002 +0000
@@ -1,4 +1,4 @@
-<!-- Automagically generated by the ToDo program on Mon Nov 25 18:44:03 2002 -->
+<!-- Automagically generated by the ToDo program on Tue Nov 26 09:12:17 2002 -->
 <todo version="0.1.14">
     <title>
         Gaim TODO List
@@ -566,9 +566,6 @@
         <note priority="high" time="1036976065">
             offline messages get lost, esp. if more than 1 sent
         </note>
-        <note priority="high" time="1038079250">
-            new mail message with no info in it ie ()
-        </note>
         <note priority="medium" time="1036041334">
             Chat
         </note>
diff -r 4f03d0c4fb4d -r 9178da61c19f src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Mon Nov 25 23:44:20 2002 +0000
+++ b/src/protocols/yahoo/yahoo.c	Tue Nov 26 14:13:11 2002 +0000
@@ -685,11 +685,11 @@
 		l = l->next;
 	}
 
-	if (who && email && subj) {
+	if (who && subj && email && *email) {
 		char *from = g_strdup_printf("%s (%s)", who, email);
 		connection_has_mail(gc, -1, from, subj, "http://mail.yahoo.com/");
 		g_free(from);
-	} else
+	} else if (count > 0)
 		connection_has_mail(gc, count, NULL, NULL, "http://mail.yahoo.com/");
 }
 /* This is the y64 alphabet... it's like base64, but has a . and a _ */
diff -r 4f03d0c4fb4d -r 9178da61c19f src/prpl.c
--- a/src/prpl.c	Mon Nov 25 23:44:20 2002 +0000
+++ b/src/prpl.c	Tue Nov 26 14:13:11 2002 +0000
@@ -450,7 +450,7 @@
 
 	if (count < 0) {
 		if (from && subject)
-			g_snprintf(buf, sizeof buf, "%s has mail from %s: %s", gc->username, from, subject);
+			g_snprintf(buf, sizeof buf, "%s has mail from %s: %s", gc->username, from, *subject ? subject : _("No Subject"));
 		else
 			g_snprintf(buf, sizeof buf, "%s has new mail.", gc->username);
 	} else if (count > 0) {