Changeset 9fae35c for protocols/msn/msn.c

Timestamp:

2006-01-23T23:28:13Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

ec3e411

Parents:

7308b63 (diff), 68c7c14 (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:

Merge from Wilmer

File:

• protocols/msn/msn.c (modified) (3 diffs)

protocols/msn/msn.c

@@ -170 +170 @@
         
         for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                l = g_list_append( l, msn_away_state_list[i].name );
+                l = g_list_append( l, (void*) msn_away_state_list[i].name );
         
         return( l );
@@ -177 +177 @@
 static char *msn_get_status_string( struct gaim_connection *gc, int number )
 {
-        struct msn_away_state *st = msn_away_state_by_number( number );
+        const struct msn_away_state *st = msn_away_state_by_number( number );
         
         if( st )
-                return( st->name );
+                return( (char*) st->name );
         else
                 return( "" );
@@ -189 +189 @@
         char buf[1024];
         struct msn_data *md = gc->proto_data;
-        struct msn_away_state *st;
+        const struct msn_away_state *st;
         
         if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )