Changeset be609ff for protocols/msn/ns.c

Timestamp:

2010-03-12T19:10:16Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dde9d571

Parents:

08e5bb2 (diff), 8b6b740 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

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

protocols/msn/ns.c

@@ -420 +420 @@
                 {
                         /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list;
-                }
-                
-                imcb_buddy_status( ic, cmd[3], OPT_LOGGED_IN |
-                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
+                        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 );
         }
         else if( strcmp( cmd[0], "FLN" ) == 0 )
@@ -449 +450 @@
                 {
                         /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list;
-                }
-                
-                imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN |
-                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
+                        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 );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )
@@ -663 +665 @@
                                 }
                                 
-                                if( arg1 ) g_free( arg1 );
-                                if( mtype ) g_free( mtype );
+                                g_free( arg1 );
+                                g_free( mtype );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsprofile", 20 ) == 0 )
@@ -672 +674 @@
                         else if( g_strncasecmp( ct, "text/x-msmsgsinitialemailnotification", 37 ) == 0 )
                         {
-                                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" ) )
+                                if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+                                        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 );
                                 }
-                                
-                                g_free( inbox );
-                                g_free( folders );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )
                         {
-                                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" ) )
+                                if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
+                                        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 );
                                 }
                         }