Changeset 4255320 for protocols

Timestamp:

2010-07-27T22:18:27Z (14 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:

• msn.c (modified) (1 diff)
• msn_util.c (modified) (3 diffs)

protocols/msn/msn.c

@@ -301 +301 @@
 static int msn_send_typing( struct im_connection *ic, char *who, int typing )
 {
-        if( typing & OPT_TYPING )
+        struct bee_user *bu = bee_user_by_handle( ic->bee, ic, who );
+        
+        if( !( bu->flags & BEE_USER_ONLINE ) )
+                return 0;
+        else if( typing & OPT_TYPING )
                 return( msn_buddy_msg( ic, who, TYPING_NOTIFICATION_MESSAGE, 0 ) );
         else
-                return( 1 );
+                return 1;
 }
 

protocols/msn/msn_util.c

@@ -398 +398 @@
         GString *ret;
         GSList *l;
+        int n = 0;
         
         l = *list;
@@ -412 +413 @@
                 m = l->data;
                 
-                g_string_append_printf( ret, "\n%s", m->text );
+                if( strncmp( m->text, "\r\r\r", 3 ) != 0 )
+                {
+                        g_string_append_printf( ret, "\n%s", m->text );
+                        n ++;
+                }
                 
                 g_free( m->who );
@@ -423 +428 @@
         *list = NULL;
         
-        imcb_log( ic, "%s", ret->str );
+        if( n > 0 )
+                imcb_log( ic, "%s", ret->str );
         g_string_free( ret, TRUE );
 }