im.pidgin.pidgin: 9fc68e2ca777cd775258519c44b4007fd5a706c9

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 9fc68e2ca777cd775258519c44b4007fd5a706c9
Ancestor: 5dc4cf40c038206bcf06fe7407e1e308b0264e32
Author: sadrul at pidgin.im
Date: 2007-12-04T22:20:18
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c

ChangeLog: 

Don't show a 'you ain't got no new mail' notification.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/notification.c	40e305f3fe0c683ee05afa2125c7abd2ccebb7d7
+++ libpurple/protocols/msn/notification.c	5ca6c66506c4d68e65e2f8c27a229fc3eabc5620
@@ -1777,7 +1777,7 @@ initial_email_msg(MsnCmdProc *cmdproc, M
 			passport = msn_user_get_passport(session->user);
 			url = session->passport_info.file;
 
-			purple_notify_emails(gc, atoi(unread), FALSE, NULL, NULL,
+			purple_notify_emails(gc, count, FALSE, NULL, NULL,
 							   &passport, &url, NULL, NULL);
 		}
 	}
@@ -1850,7 +1850,7 @@ initial_mdata_msg(MsnCmdProc *cmdproc, M
 			passport = msn_user_get_passport(session->user);
 			url = session->passport_info.file;
 
-			purple_notify_emails(gc, atoi(unread), FALSE, NULL, NULL,
+			purple_notify_emails(gc, count, FALSE, NULL, NULL,
 							   &passport, &url, NULL, NULL);
 		}
 	}
============================================================
--- libpurple/protocols/msn/oim.c	f588953d18124d5407fc2ac82941e78d134e11b4
+++ libpurple/protocols/msn/oim.c	4ff5b0d2e4a50e78154b347eb6f8f72b3db795b1
@@ -488,10 +488,12 @@ msn_parse_oim_msg(MsnOim *oim,const char
 		char *unread = xmlnode_get_data(iu_node);
 		const char *passport = msn_user_get_passport(session->user);
 		const char *url = session->passport_info.file;
+		int count = atoi(unread);
 
 		/* XXX/khc: pretty sure this is wrong */
-		purple_notify_emails(session->account->gc, atoi(unread), FALSE, NULL,
-			NULL, &passport, &url, NULL, NULL);
+		if (count > 0)
+			purple_notify_emails(session->account->gc, count, FALSE, NULL,
+				NULL, &passport, &url, NULL, NULL);
 		g_free(unread);
 	}