Changes in protocols/msn/ns.c [21d48d9:823de9d]

File:

• protocols/msn/ns.c (modified) (6 diffs)

protocols/msn/ns.c

@@ -229 +229 @@
                         }
                 }
-                else if( num_parts >= 7 && strcmp( cmd[2], "OK" ) == 0 )
+                else if( num_parts == 7 && strcmp( cmd[2], "OK" ) == 0 )
                 {
                         set_t *s;
                         
-                        if( num_parts == 7 )
-                        {
-                                http_decode( cmd[4] );
-                                
-                                strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
-                                ic->displayname[sizeof(ic->displayname)-1] = 0;
-                                
-                                if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
-                                {
-                                        g_free( s->value );
-                                        s->value = g_strdup( cmd[4] );
-                                }
-                        }
-                        else
-                        {
-                                imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
+                        http_decode( cmd[4] );
+                        
+                        strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
+                        ic->displayname[sizeof(ic->displayname)-1] = 0;
+                        
+                        if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
+                        {
+                                g_free( s->value );
+                                s->value = g_strdup( cmd[4] );
                         }
                         
@@ -285 +278 @@
                 if( num_parts == 5 )
                 {
-                        int i, groupcount;
-                        
-                        groupcount = atoi( cmd[4] );
-                        if( groupcount > 0 )
-                        {
-                                /* valgrind says this is leaking memory, I'm guessing
-                                   that this happens during server redirects. */
-                                if( md->grouplist )
-                                {
-                                        for( i = 0; i < md->groupcount; i ++ )
-                                                g_free( md->grouplist[i] );
-                                        g_free( md->grouplist );
-                                }
-                                
-                                md->groupcount = groupcount;
+                        md->buddycount = atoi( cmd[3] );
+                        md->groupcount = atoi( cmd[4] );
+                        if( md->groupcount > 0 )
                                 md->grouplist = g_new0( char *, md->groupcount );
-                        }
-                        
-                        md->buddycount = atoi( cmd[3] );
+                        
                         if( !*cmd[3] || md->buddycount == 0 )
                                 msn_logged_in( ic );
@@ -427 +406 @@
                 {
                         /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list + 1;
-                }
-                
-                imcb_buddy_status( ic, cmd[3], OPT_LOGGED_IN | 
-                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ),
-                                   st->name, NULL );
+                        st = msn_away_state_list;
+                }
+                
+                imcb_buddy_status( ic, cmd[3], OPT_LOGGED_IN |
+                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
         }
         else if( strcmp( cmd[0], "FLN" ) == 0 )
@@ -457 +435 @@
                 {
                         /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list + 1;
-                }
-                
-                imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN | 
-                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ),
-                                   st->name, NULL );
+                        st = msn_away_state_list;
+                }
+                
+                imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN |
+                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )
@@ -672 +649 @@
                                 }
                                 
-                                g_free( arg1 );
-                                g_free( mtype );
+                                if( arg1 ) g_free( arg1 );
+                                if( mtype ) g_free( mtype );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsprofile", 20 ) == 0 )
@@ -681 +658 @@
                         else if( g_strncasecmp( ct, "text/x-msmsgsinitialemailnotification", 37 ) == 0 )
                         {
-                                if( set_getbool( &ic->acc->set, "mail_notifications" ) )
+                                char *inbox = msn_findheader( body, "Inbox-Unread:", blen );
+                                char *folders = msn_findheader( body, "Folders-Unread:", blen );
+                                
+                                if( inbox && folders && set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        char *inbox = msn_findheader( body, "Inbox-Unread:", blen );
-                                        char *folders = msn_findheader( body, "Folders-Unread:", blen );
-
-                                        if( inbox && folders )
-                                                imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
-                                        
-                                        g_free( inbox );
-                                        g_free( folders );
+                                        imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
                                 }
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )
                         {
-                                if( set_getbool( &ic->acc->set, "mail_notifications" ) )
+                                char *from = msn_findheader( body, "From-Addr:", blen );
+                                char *fromname = msn_findheader( body, "From:", blen );
+                                
+                                if( from && fromname && set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        char *from = msn_findheader( body, "From-Addr:", blen );
-                                        char *fromname = msn_findheader( body, "From:", blen );
-                                        
-                                        if( from && fromname )
-                                                imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
-
-                                        g_free( from );
-                                        g_free( fromname );
+                                        imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
                                 }
                         }