Changeset 36577aa


Ignore:
Timestamp:
2010-05-09T00:28:38Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
75610c3
Parents:
eb37735
Message:

Create the struct groupchat early on in msn_chat_with() so the new chat
setup method works properly.

Location:
protocols/msn
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/msn.c

    reb37735 r36577aa  
    223223{
    224224        struct msn_switchboard *sb;
     225        struct groupchat *c = imcb_chat_new( ic, who );
    225226       
    226227        if( ( sb = msn_sb_by_handle( ic, who ) ) )
     
    240241                msn_sb_write_msg( ic, m );
    241242
    242                 return NULL;
    243         }
    244        
    245         return NULL;
     243                return c;
     244        }
    246245}
    247246
  • protocols/msn/sb.c

    reb37735 r36577aa  
    237237        /* Create the groupchat structure. */
    238238        g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
    239         sb->chat = imcb_chat_new( ic, buf );
     239        if( sb->who )
     240                sb->chat = bee_chat_by_title( ic->bee, ic, sb->who );
     241        if( sb->chat == NULL )
     242                sb->chat = imcb_chat_new( ic, buf );
    240243       
    241244        /* Populate the channel. */
Note: See TracChangeset for help on using the changeset viewer.