Changeset 662

Show
Ignore:
Timestamp:
12/29/05 22:43:17 (3 years ago)
Author:
jajcus
Message:

- fix of use of uninitialized variables

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/presence.c

    r661 r662  
    332332        if (jid_is_me(to)){ 
    333333                if (u->subscribe==SUB_FROM) u->subscribe=SUB_NONE; 
    334                 else if (u->subscribe==SUB_BOTH || c->subscribe==SUB_UNDEFINED) u->subscribe=SUB_TO; 
     334                else if (u->subscribe==SUB_BOTH || u->subscribe==SUB_UNDEFINED) u->subscribe=SUB_TO; 
    335335                user_save(u); 
    336336                debug(L_("Presence 'unsubscribed' sent to me")); 
     
    362362uin_t uin; 
    363363 
    364         if (jid_is_me(to)){ 
    365                 debug(L_("Presence unsubscribe request sent to me")); 
    366                 if (u->subscribe==SUB_TO || c->subscribe==SUB_UNDEFINED) u->subscribe=SUB_NONE; 
    367                 else if (u->subscribe==SUB_BOTH) u->subscribe=SUB_FROM; 
    368                 user_save(u); 
    369                 presence_send_unsubscribed(stream,to,from); 
    370                 return 0; 
    371         } 
    372364        u=user_get_by_jid(from); 
    373365        if (!u){ 
    374366                g_warning(N_("Presence subscription from unknown user (%s)"),from); 
    375                 return -1; 
     367                presence_send_unsubscribed(stream,to,from); 
     368                return -1; 
     369        } 
     370        if (jid_is_me(to)){ 
     371                debug(L_("Presence unsubscribe request sent to me")); 
     372                if (u->subscribe==SUB_TO || u->subscribe==SUB_UNDEFINED) u->subscribe=SUB_NONE; 
     373                else if (u->subscribe==SUB_BOTH) u->subscribe=SUB_FROM; 
     374                user_save(u); 
     375                return 0; 
    376376        } 
    377377        if (!jid_has_uin(to) || !jid_is_my(to)){