# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1196807031 0
# Node ID 6fe5e9e859790a3693defce8cf1569762613e053
# Parent  6b42bed44324e877d56949dcc86a2e694ae805fc# Parent  7ac87187bbecc0e8410a63e5cba5fd4636606e16
merge of '1d6b24ed027c253dbe63f69d5e40b43cd7faf436'
     and '9fc68e2ca777cd775258519c44b4007fd5a706c9'

diff -r 6b42bed44324 -r 6fe5e9e85979 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Tue Dec 04 20:27:06 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Tue Dec 04 22:23:51 2007 +0000
@@ -1777,7 +1777,7 @@
 			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 @@
 			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);
 		}
 	}
diff -r 6b42bed44324 -r 6fe5e9e85979 libpurple/protocols/msn/oim.c
--- a/libpurple/protocols/msn/oim.c	Tue Dec 04 20:27:06 2007 +0000
+++ b/libpurple/protocols/msn/oim.c	Tue Dec 04 22:23:51 2007 +0000
@@ -488,10 +488,12 @@
 		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);
 	}