Changeset be609ff for protocols/msn/tables.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/tables.c (modified) (3 diffs)

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", "" },
+        { "AWY", "Away" },
+        { "BSY", "Busy" },
+        { "IDL", "Idle" },
+        { "BRB", "Be Right Back" },
+        { "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;
 }