Mercurial > pidgin.yaz
changeset 4308:b3a14484fc2f
[gaim-migrate @ 4562]
Fix the "Remove" permit buddy button in le privacy dialogueueue.
I also screwed around with a bit 'o syntax in ssi.c, and hopefully
make the uin@pager.icq.com receiving thing nice. I _still_ don't
know why I can't send an email through that reliably.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 12 Jan 2003 23:13:51 +0000 |
| parents | 545d153a5341 |
| children | 5978e3d53f29 |
| files | src/dialogs.c src/protocols/oscar/oscar.c src/protocols/oscar/ssi.c |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dialogs.c Sun Jan 12 19:23:44 2003 +0000 +++ b/src/dialogs.c Sun Jan 12 23:13:51 2003 +0000 @@ -1394,7 +1394,7 @@ if (name) { current_deny_gc->permit = g_slist_remove(current_deny_gc->permit, name); - serv_rem_deny(current_deny_gc, who); + serv_rem_permit(current_deny_gc, who); build_allow_list(); } } else {
--- a/src/protocols/oscar/oscar.c Sun Jan 12 19:23:44 2003 +0000 +++ b/src/protocols/oscar/oscar.c Sun Jan 12 23:13:51 2003 +0000 @@ -2242,7 +2242,7 @@ case 0x0e: { /* Someone has emailed you at your_uin@pager.icq.com */ if (i >= 6) { - gchar *dialog_msg = g_strdup_printf(_("You have received an ICQ email\n\n1=%s\n2=%s\n3=%s\n4=%s\n5=%s\n6=%s\n"), msg2[0], msg2[1], msg2[2], msg2[3], msg2[4], msg2[5]); + gchar *dialog_msg = g_strdup_printf(_("You have received an ICQ email from %s [%s]\n\nMessage is:\n%s"), msg2[0], msg2[3], msg2[5]); do_error_dialog("ICQ Email", dialog_msg, GAIM_INFO); g_free(dialog_msg); }
--- a/src/protocols/oscar/ssi.c Sun Jan 12 19:23:44 2003 +0000 +++ b/src/protocols/oscar/ssi.c Sun Jan 12 23:13:51 2003 +0000 @@ -154,7 +154,7 @@ *list = new; } else { struct aim_ssi_item *prev; - for ((prev=*list, cur=(*list)->next); (cur && (new->gid > cur->gid || ((new->gid == cur->gid) && (new->bid > cur->bid)))); prev=cur, cur=cur->next); + for ((prev=*list, cur=(*list)->next); (cur && ((new->gid > cur->gid) || ((new->gid == cur->gid) && (new->bid > cur->bid)))); prev=cur, cur=cur->next); new->next = prev->next; prev->next = new; } @@ -180,7 +180,7 @@ /* Remove the item from the list */ if (*list == del) { - *list = del->next; + *list = (*list)->next; } else { struct aim_ssi_item *cur; for (cur=*list; (cur->next && (cur->next!=del)); cur=cur->next);