Changeset 4255320


Ignore:
Timestamp:
2010-07-27T22:18:27Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
13fa2db
Parents:
f6f5eee
Message:

MSN: Don't show any "special" messages when breaking down switchboards with
queued messages. They were never supposed to be seen by the user. Also,
don't send them all to offline users.

Location:
protocols/msn
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/msn.c

    rf6f5eee r4255320  
    301301static int msn_send_typing( struct im_connection *ic, char *who, int typing )
    302302{
    303         if( typing & OPT_TYPING )
     303        struct bee_user *bu = bee_user_by_handle( ic->bee, ic, who );
     304       
     305        if( !( bu->flags & BEE_USER_ONLINE ) )
     306                return 0;
     307        else if( typing & OPT_TYPING )
    304308                return( msn_buddy_msg( ic, who, TYPING_NOTIFICATION_MESSAGE, 0 ) );
    305309        else
    306                 return( 1 );
     310                return 1;
    307311}
    308312
  • protocols/msn/msn_util.c

    rf6f5eee r4255320  
    398398        GString *ret;
    399399        GSList *l;
     400        int n = 0;
    400401       
    401402        l = *list;
     
    412413                m = l->data;
    413414               
    414                 g_string_append_printf( ret, "\n%s", m->text );
     415                if( strncmp( m->text, "\r\r\r", 3 ) != 0 )
     416                {
     417                        g_string_append_printf( ret, "\n%s", m->text );
     418                        n ++;
     419                }
    415420               
    416421                g_free( m->who );
     
    423428        *list = NULL;
    424429       
    425         imcb_log( ic, "%s", ret->str );
     430        if( n > 0 )
     431                imcb_log( ic, "%s", ret->str );
    426432        g_string_free( ret, TRUE );
    427433}
Note: See TracChangeset for help on using the changeset viewer.