Changeset be609ff for protocols/msn/msn.c

Timestamp:

2010-03-12T19:10:16Z (15 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/msn.c (modified) (2 diffs)

protocols/msn/msn.c

@@ -139 +139 @@
         
         if( l == NULL )
-                for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                        l = g_list_append( l, (void*) msn_away_state_list[i].name );
+                for( i = 0; *msn_away_state_list[i].code; i ++ )
+                        if( *msn_away_state_list[i].name )
+                                l = g_list_append( l, (void*) msn_away_state_list[i].name );
         
         return l;
@@ -149 +150 @@
         char buf[1024];
         struct msn_data *md = ic->proto_data;
-        const struct msn_away_state *st;
-        
-        if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )
-                st = msn_away_state_by_name( "Away" );
+        
+        if( state )
+                md->away_state = msn_away_state_by_name( state ) ? :
+                                 msn_away_state_list + 1;
         else
-                st = msn_away_state_by_name( state );
-        
-        if( !st ) st = msn_away_state_list;
-        md->away_state = st;
-        
-        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, st->code );
+                md->away_state = msn_away_state_list;
+        
+        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
         msn_write( ic, buf, strlen( buf ) );
 }