changeset
merge of '2cf0d62160824686ff5a3669cddb9b48e4d015e3'
Tue, 04 Dec 2007 22:23:51 +0000
- author
- Sadrul Habib Chowdhury <sadrul@pidgin.im>
- date
- Tue, 04 Dec 2007 22:23:51 +0000
- changeset 21887
- 6d73e83f636a
- parent 21884
- 2cf0d6216082 (current diff)
- parent 21886
- be9880b42bd2 (diff)
- child 21888
- c59f2fb04c7c
merge of '2cf0d62160824686ff5a3669cddb9b48e4d015e3'
and 'be9880b42bd2536b73aa3f5c9e02b746c11142c0'
--- 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); } }
--- 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); }
