Changeset b051d39 for protocols

Timestamp:

2010-03-06T15:44:46Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

17f9522

Parents:

2bc8ac0

Message:

MSN module updated to deal with the new API. Not many changes since it
doesn't currently support away messages anyway. This is more a bit of a
cleanup.

Location:

protocols/msn

Files:

• msn.c (modified) (2 diffs)
• msn.h (modified) (1 diff)
• ns.c (modified) (2 diffs)
• tables.c (modified) (3 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 ) );
 }

protocols/msn/msn.h

@@ -97 +97 @@
 struct msn_away_state
 {
-        int number;
         char code[4];
         char name[16];

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 )

protocols/msn/tables.c

@@ -29 +29 @@
 const struct msn_away_state msn_away_state_list[] =
 {
-        {  0, "NLN", "Available" },
-        {  1, "BSY", "Busy" },
-        {  3, "IDL", "Idle" },
-        {  5, "BRB", "Be Right Back" },
-        {  7, "AWY", "Away" },
-        {  9, "PHN", "On the Phone" },
-        { 11, "LUN", "Out to Lunch" },
-        { 13, "HDN", "Hidden" },
-        { -1, "",    "" }
+        { "NLN", "" },
+        { "BSY", "Busy" },
+        { "IDL", "Idle" },
+        { "BRB", "Be Right Back" },
+        { "AWY", "Away" },
+        { "PHN", "On the Phone" },
+        { "LUN", "Out to Lunch" },
+        { "HDN", "Hidden" },
+        { "",    "" }
 };
-
-const struct msn_away_state *msn_away_state_by_number( int number )
-{
-        int i;
-        
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                if( msn_away_state_list[i].number == number )
-                        return( msn_away_state_list + i );
-        
-        return( NULL );
-}
 
 const struct msn_away_state *msn_away_state_by_code( char *code )
@@ -55 +44 @@
         int i;
         
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
+        for( i = 0; *msn_away_state_list[i].code; i ++ )
                 if( g_strcasecmp( msn_away_state_list[i].code, code ) == 0 )
                         return( msn_away_state_list + i );
         
-        return( NULL );
+        return NULL;
 }
 
@@ -66 +55 @@
         int i;
         
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
+        for( i = 0; *msn_away_state_list[i].code; i ++ )
                 if( g_strcasecmp( msn_away_state_list[i].name, name ) == 0 )
                         return( msn_away_state_list + i );
         
-        return( NULL );
+        return NULL;
 }