Mercurial > pidgin
comparison libpurple/protocols/oscar/oscar.c @ 25606:2260e5b0ca91
*** Plucked rev f9080d0b (khc@pidgin.im):
correctly NULL terminate all the arrays since that's what gtknotify assumes,
also fixed a memory leak in gmail notification
*** Plucked rev a543de79 (khc@pidgin.im):
Qulogic pointed out that glib has G_N_ELEMENTS already
*** Plucked rev 19b202a7 (khc@pidgin.im):
used the wrong count variable here
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 10 May 2009 23:25:26 +0000 |
parents | 7f552614ec8a |
children | d5379aad12d0 |
comparison
equal
deleted
inserted
replaced
25605:9c0337d4b878 | 25606:2260e5b0ca91 |
---|---|
3558 | 3558 |
3559 if ((emailinfo != NULL) && purple_account_get_check_mail(gc->account)) { | 3559 if ((emailinfo != NULL) && purple_account_get_check_mail(gc->account)) { |
3560 gchar *to = g_strdup_printf("%s%s%s", purple_account_get_username(purple_connection_get_account(gc)), | 3560 gchar *to = g_strdup_printf("%s%s%s", purple_account_get_username(purple_connection_get_account(gc)), |
3561 emailinfo->domain ? "@" : "", | 3561 emailinfo->domain ? "@" : "", |
3562 emailinfo->domain ? emailinfo->domain : ""); | 3562 emailinfo->domain ? emailinfo->domain : ""); |
3563 const char *tos[2] = { to }; | |
3564 const char *urls[2] = {emailinfo->url }; | |
3563 if (emailinfo->unread && havenewmail) | 3565 if (emailinfo->unread && havenewmail) |
3564 purple_notify_emails(gc, emailinfo->nummsgs, FALSE, NULL, NULL, (const char **)&to, (const char **)&emailinfo->url, NULL, NULL); | 3566 purple_notify_emails(gc, emailinfo->nummsgs, FALSE, NULL, NULL, tos, urls, NULL, NULL); |
3565 g_free(to); | 3567 g_free(to); |
3566 } | 3568 } |
3567 | 3569 |
3568 if (alertitle) | 3570 if (alertitle) |
3569 purple_debug_misc("oscar", "Got an alert '%s' %s\n", alertitle, alerturl ? alerturl : ""); | 3571 purple_debug_misc("oscar", "Got an alert '%s' %s\n", alertitle, alerturl ? alerturl : ""); |