Changes in protocols/msn/msn.c [9cb9868:1053836]

File:

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

protocols/msn/msn.c

@@ -27 +27 @@
 #include "msn.h"
 
-static struct prpl *my_protocol = NULL;
-
 static void msn_login( struct aim_user *acct )
 {
@@ -86 +84 @@
                 {
                         m = l->data;
+                
+                        serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
                         g_free( m->who );
                         g_free( m->text );
@@ -91 +91 @@
                 }
                 g_slist_free( md->msgq );
-                
-                serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message(s), you'll have to resend them." );
         }
         
@@ -172 +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 );
@@ -179 +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( "" );
@@ -191 +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 )
@@ -375 +373 @@
 }
 
-void msn_init(struct prpl *ret)
-{
-        ret->protocol = PROTO_MSN;
+void msn_init()
+{
+        struct prpl *ret = g_new0(struct prpl, 1);
+        ret->name = "msn";
         ret->login = msn_login;
         ret->close = msn_close;
@@ -400 +399 @@
         ret->cmp_buddynames = g_strcasecmp;
 
-        my_protocol = ret;
-}
+        register_protocol(ret);
+}