Changes in protocols/msn/msn.c [b051d39:a830512]

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