gaim/gaim

So this was supposed to fix something, and it did, but it broke something a little more important, so let's revert this until we can fix it correctly.
oldstatus
2005-03-16, Etan Reisner
fb826633d237
Parents 62a302ca2820
Children 2d38708b8686
So this was supposed to fix something, and it did, but it broke something a little more important, so let's revert this until we can fix it correctly.
1 files changed, 12 insertions(+), 10 deletions(-)
  • +12 -10
    src/protocols/jabber/roster.c
    • --- a/src/protocols/jabber/roster.c Tue Mar 15 22:14:01 2005 -0500
    +++ b/src/protocols/jabber/roster.c Wed Mar 16 02:48:01 2005 -0500
    @@ -163,16 +163,18 @@
    if(!(jb = jabber_buddy_find(js, jid, TRUE)))
    continue;
    - if(subscription) {
    - if(!strcmp(subscription, "to"))
    - jb->subscription |= JABBER_SUB_TO;
    - else if(!strcmp(subscription, "from"))
    - jb->subscription |= JABBER_SUB_FROM;
    - else if(!strcmp(subscription, "both"))
    - jb->subscription |= JABBER_SUB_BOTH;
    - else if(!strcmp(subscription, "remove"))
    - jb->subscription |= JABBER_SUB_REMOVE;
    - }
    + if(!subscription)
    + jb->subscription = JABBER_SUB_NONE;
    + else if(!strcmp(subscription, "to"))
    + jb->subscription = JABBER_SUB_TO;
    + else if(!strcmp(subscription, "from"))
    + jb->subscription = JABBER_SUB_FROM;
    + else if(!strcmp(subscription, "both"))
    + jb->subscription = JABBER_SUB_BOTH;
    + else if(!strcmp(subscription, "remove"))
    + jb->subscription = JABBER_SUB_REMOVE;
    + else
    + jb->subscription = JABBER_SUB_NONE;
    if(ask && !strcmp(ask, "subscribe"))
    jb->subscription |= JABBER_SUB_PENDING;