Changeset 0da65d5 for protocols/msn

Timestamp:

2007-03-31T05:40:45Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

aef4828

Parents:

fa29d093

Message:

s/gaim_connection/im_connection/ and some other minor API changes. The rest
will come tomorrow. It compiles, I'll leave the real testing up to someone
else. ;-)

Location:

protocols/msn

Files:

• msn.c (modified) (21 diffs)
• msn.h (modified) (5 diffs)
• msn_util.c (modified) (10 diffs)
• ns.c (modified) (44 diffs)
• sb.c (modified) (22 diffs)

protocols/msn/msn.c

@@ -29 +29 @@
 static char *msn_set_display_name( set_t *set, char *value );
 
-static void msn_acc_init( account_t *acc )
+static void msn_init( account_t *acc )
 {
         set_t *s;
@@ -39 +39 @@
 static void msn_login( account_t *acc )
 {
-        struct gaim_connection *gc = new_gaim_conn( acc );
+        struct im_connection *ic = new_gaim_conn( acc );
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
-        gc->proto_data = md;
+        ic->proto_data = md;
         md->fd = -1;
         
         if( strchr( acc->user, '@' ) == NULL )
         {
-                hide_login_progress( gc, "Invalid account name" );
-                signoff( gc );
+                hide_login_progress( ic, "Invalid account name" );
+                signoff( ic );
                 return;
         }
         
-        set_login_progress( gc, 1, "Connecting" );
-        
-        md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, gc );
+        set_login_progress( ic, 1, "Connecting" );
+        
+        md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, ic );
         if( md->fd < 0 )
         {
-                hide_login_progress( gc, "Could not connect to server" );
-                signoff( gc );
+                hide_login_progress( ic, "Could not connect to server" );
+                signoff( ic );
                 return;
         }
         
-        md->gc = gc;
+        md->ic = ic;
         md->away_state = msn_away_state_list;
         
-        msn_connections = g_slist_append( msn_connections, gc );
-}
-
-static void msn_close( struct gaim_connection *gc )
-{
-        struct msn_data *md = gc->proto_data;
+        msn_connections = g_slist_append( msn_connections, ic );
+}
+
+static void msn_logout( struct im_connection *ic )
+{
+        struct msn_data *md = ic->proto_data;
         GSList *l;
         
@@ -96 +96 @@
                                 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 );
+                                serv_got_crap( ic, "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 );
@@ -111 +111 @@
         }
         
-        for( l = gc->permit; l; l = l->next )
+        for( l = ic->permit; l; l = l->next )
                 g_free( l->data );
-        g_slist_free( gc->permit );
-        
-        for( l = gc->deny; l; l = l->next )
+        g_slist_free( ic->permit );
+        
+        for( l = ic->deny; l; l = l->next )
                 g_free( l->data );
-        g_slist_free( gc->deny );
-        
-        msn_connections = g_slist_remove( msn_connections, gc );
-}
-
-static int msn_send_im( struct gaim_connection *gc, char *who, char *message, int len, int away )
+        g_slist_free( ic->deny );
+        
+        msn_connections = g_slist_remove( msn_connections, ic );
+}
+
+static int msn_send_im( struct im_connection *ic, char *who, char *message, int away )
 {
         struct msn_switchboard *sb;
-        struct msn_data *md = gc->proto_data;
-        
-        if( ( sb = msn_sb_by_handle( gc, who ) ) )
+        struct msn_data *md = ic->proto_data;
+        
+        if( ( sb = msn_sb_by_handle( ic, who ) ) )
         {
                 return( msn_sb_sendmessage( sb, message ) );
@@ -142 +142 @@
                 
                 /* FIXME: *CHECK* the reliability of using spare sb's! */
-                if( ( sb = msn_sb_spare( gc ) ) )
+                if( ( sb = msn_sb_spare( ic ) ) )
                 {
                         debug( "Trying to use a spare switchboard to message %s", who );
@@ -160 +160 @@
                 /* If we reach this line, there was no spare switchboard, so let's make one. */
                 g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                if( !msn_write( gc, buf, strlen( buf ) ) )
+                if( !msn_write( ic, buf, strlen( buf ) ) )
                 {
                         g_free( m->who );
@@ -180 +180 @@
 }
 
-static GList *msn_away_states( struct gaim_connection *gc )
+static GList *msn_away_states( struct im_connection *ic )
 {
         static GList *l = NULL;
@@ -192 +192 @@
 }
 
-static char *msn_get_status_string( struct gaim_connection *gc, int number )
+static char *msn_get_status_string( struct im_connection *ic, int number )
 {
         const struct msn_away_state *st = msn_away_state_by_number( number );
@@ -202 +202 @@
 }
 
-static void msn_set_away( struct gaim_connection *gc, char *state, char *message )
+static void msn_set_away( struct im_connection *ic, char *state, char *message )
 {
         char buf[1024];
-        struct msn_data *md = gc->proto_data;
+        struct msn_data *md = ic->proto_data;
         const struct msn_away_state *st;
         
@@ -217 +217 @@
         
         g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, st->code );
-        msn_write( gc, buf, strlen( buf ) );
-}
-
-static void msn_set_info( struct gaim_connection *gc, char *info )
-{
-        msn_set_display_name( set_find( &gc->acc->set, "display_name" ), info );
-}
-
-static void msn_get_info(struct gaim_connection *gc, char *who) 
+        msn_write( ic, buf, strlen( buf ) );
+}
+
+static void msn_set_my_name( struct im_connection *ic, char *info )
+{
+        msn_set_display_name( set_find( &ic->acc->set, "display_name" ), info );
+}
+
+static void msn_get_info(struct im_connection *ic, char *who) 
 {
         /* Just make an URL and let the user fetch the info */
-        serv_got_crap( gc, "%s\n%s: %s%s", _("User Info"), _("For now, fetch yourself"), PROFILE_URL, who );
-}
-
-static void msn_add_buddy( struct gaim_connection *gc, char *who )
-{
-        msn_buddy_list_add( gc, "FL", who, who );
-}
-
-static void msn_remove_buddy( struct gaim_connection *gc, char *who, char *group )
-{
-        msn_buddy_list_remove( gc, "FL", who );
-}
-
-static int msn_chat_send( struct conversation *c, char *message )
+        serv_got_crap( ic, "%s\n%s: %s%s", _("User Info"), _("For now, fetch yourself"), PROFILE_URL, who );
+}
+
+static void msn_add_buddy( struct im_connection *ic, char *who, char *group )
+{
+        msn_buddy_list_add( ic, "FL", who, who );
+}
+
+static void msn_remove_buddy( struct im_connection *ic, char *who, char *group )
+{
+        msn_buddy_list_remove( ic, "FL", who );
+}
+
+static void msn_chat_send( struct groupchat *c, char *message, int flags )
 {
         struct msn_switchboard *sb = msn_sb_by_chat( c );
         
         if( sb )
-                return( msn_sb_sendmessage( sb, message ) );
-        else
-                return( 0 );
-}
-
-static void msn_chat_invite( struct conversation *c, char *msg, char *who )
+                msn_sb_sendmessage( sb, message );
+        /* FIXME: Error handling (although this can't happen unless something's
+           already severely broken) disappeared here! */
+}
+
+static void msn_chat_invite( struct groupchat *c, char *msg, char *who )
 {
         struct msn_switchboard *sb = msn_sb_by_chat( c );
@@ -263 +263 @@
 }
 
-static void msn_chat_leave( struct conversation *c )
+static void msn_chat_leave( struct groupchat *c )
 {
         struct msn_switchboard *sb = msn_sb_by_chat( c );
@@ -271 +271 @@
 }
 
-static struct conversation *msn_chat_open( struct gaim_connection *gc, char *who )
+static struct groupchat *msn_chat_with( struct im_connection *ic, char *who )
 {
         struct msn_switchboard *sb;
-        struct msn_data *md = gc->proto_data;
+        struct msn_data *md = ic->proto_data;
         char buf[1024];
         
-        if( ( sb = msn_sb_by_handle( gc, who ) ) )
+        if( ( sb = msn_sb_by_handle( ic, who ) ) )
         {
                 debug( "Converting existing switchboard to %s to a groupchat", who );
@@ -286 +286 @@
                 struct msn_message *m;
                 
-                if( ( sb = msn_sb_spare( gc ) ) )
+                if( ( sb = msn_sb_spare( ic ) ) )
                 {
                         debug( "Trying to reuse an existing switchboard as a groupchat with %s", who );
@@ -299 +299 @@
                 /* Request a new switchboard. */
                 g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                if( !msn_write( gc, buf, strlen( buf ) ) )
+                if( !msn_write( ic, buf, strlen( buf ) ) )
                         return( 0 );
                 
@@ -317 +317 @@
 }
 
-static void msn_keepalive( struct gaim_connection *gc )
-{
-        msn_write( gc, "PNG\r\n", strlen( "PNG\r\n" ) );
-}
-
-static void msn_add_permit( struct gaim_connection *gc, char *who )
-{
-        msn_buddy_list_add( gc, "AL", who, who );
-}
-
-static void msn_rem_permit( struct gaim_connection *gc, char *who )
-{
-        msn_buddy_list_remove( gc, "AL", who );
-}
-
-static void msn_add_deny( struct gaim_connection *gc, char *who )
+static void msn_keepalive( struct im_connection *ic )
+{
+        msn_write( ic, "PNG\r\n", strlen( "PNG\r\n" ) );
+}
+
+static void msn_add_permit( struct im_connection *ic, char *who )
+{
+        msn_buddy_list_add( ic, "AL", who, who );
+}
+
+static void msn_rem_permit( struct im_connection *ic, char *who )
+{
+        msn_buddy_list_remove( ic, "AL", who );
+}
+
+static void msn_add_deny( struct im_connection *ic, char *who )
 {
         struct msn_switchboard *sb;
         
-        msn_buddy_list_add( gc, "BL", who, who );
+        msn_buddy_list_add( ic, "BL", who, who );
         
         /* If there's still a conversation with this person, close it. */
-        if( ( sb = msn_sb_by_handle( gc, who ) ) )
+        if( ( sb = msn_sb_by_handle( ic, who ) ) )
         {
                 msn_sb_destroy( sb );
@@ -345 +345 @@
 }
 
-static void msn_rem_deny( struct gaim_connection *gc, char *who )
-{
-        msn_buddy_list_remove( gc, "BL", who );
-}
-
-static int msn_send_typing( struct gaim_connection *gc, char *who, int typing )
+static void msn_rem_deny( struct im_connection *ic, char *who )
+{
+        msn_buddy_list_remove( ic, "BL", who );
+}
+
+static int msn_send_typing( struct im_connection *ic, char *who, int typing )
 {
         if( typing )
-                return( msn_send_im( gc, who, TYPING_NOTIFICATION_MESSAGE, strlen( TYPING_NOTIFICATION_MESSAGE ), 0 ) );
+                return( msn_send_im( ic, who, TYPING_NOTIFICATION_MESSAGE, 0 ) );
         else
                 return( 1 );
@@ -361 +361 @@
 {
         account_t *acc = set->data;
-        struct gaim_connection *gc = acc->gc;
+        struct im_connection *ic = acc->ic;
         struct msn_data *md;
         char buf[1024], *fn;
         
         /* Double-check. */
-        if( gc == NULL )
+        if( ic == NULL )
                 return NULL;
         
-        md = gc->proto_data;
+        md = ic->proto_data;
         
         if( strlen( value ) > 129 )
         {
-                serv_got_crap( gc, "Maximum name length exceeded" );
+                serv_got_crap( ic, "Maximum name length exceeded" );
                 return NULL;
         }
@@ -379 +379 @@
         fn = msn_http_encode( value );
         
-        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, gc->username, fn );
-        msn_write( gc, buf, strlen( buf ) );
+        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->username, fn );
+        msn_write( ic, buf, strlen( buf ) );
         g_free( fn );
         
@@ -389 +389 @@
 }
 
-void msn_init()
+void msn_initmodule()
 {
         struct prpl *ret = g_new0(struct prpl, 1);
@@ -395 +395 @@
         ret->name = "msn";
         ret->login = msn_login;
-        ret->acc_init = msn_acc_init;
-        ret->close = msn_close;
+        ret->init = msn_init;
+        ret->logout = msn_logout;
         ret->send_im = msn_send_im;
         ret->away_states = msn_away_states;
         ret->get_status_string = msn_get_status_string;
         ret->set_away = msn_set_away;
-        ret->set_info = msn_set_info;
         ret->get_info = msn_get_info;
+        ret->set_my_name = msn_set_my_name;
         ret->add_buddy = msn_add_buddy;
         ret->remove_buddy = msn_remove_buddy;
@@ -408 +408 @@
         ret->chat_invite = msn_chat_invite;
         ret->chat_leave = msn_chat_leave;
-        ret->chat_open = msn_chat_open;
+        ret->chat_with = msn_chat_with;
         ret->keepalive = msn_keepalive;
         ret->add_permit = msn_add_permit;

protocols/msn/msn.h

@@ -57 +57 @@
 struct msn_data
 {
-        struct gaim_connection *gc;
+        struct im_connection *ic;
         
         int fd;
@@ -75 +75 @@
 struct msn_switchboard
 {
-        struct gaim_connection *gc;
+        struct im_connection *ic;
         
         int fd;
@@ -89 +89 @@
         GSList *msgq;
         char *who;
-        struct conversation *chat;
+        struct groupchat *chat;
 };
 
@@ -149 +149 @@
 
 /* msn_util.c */
-int msn_write( struct gaim_connection *gc, char *s, int len );
-int msn_logged_in( struct gaim_connection *gc );
-int msn_buddy_list_add( struct gaim_connection *gc, char *list, char *who, char *realname );
-int msn_buddy_list_remove( struct gaim_connection *gc, char *list, char *who );
-void msn_buddy_ask( struct gaim_connection *gc, char *handle, char *realname );
+int msn_write( struct im_connection *ic, char *s, int len );
+int msn_logged_in( struct im_connection *ic );
+int msn_buddy_list_add( struct im_connection *ic, char *list, char *who, char *realname );
+int msn_buddy_list_remove( struct im_connection *ic, char *list, char *who );
+void msn_buddy_ask( struct im_connection *ic, char *handle, char *realname );
 char *msn_findheader( char *text, char *header, int len );
 char **msn_linesplit( char *line );
@@ -167 +167 @@
 /* sb.c */
 int msn_sb_write( struct msn_switchboard *sb, char *s, int len );
-struct msn_switchboard *msn_sb_create( struct gaim_connection *gc, char *host, int port, char *key, int session );
-struct msn_switchboard *msn_sb_by_handle( struct gaim_connection *gc, char *handle );
-struct msn_switchboard *msn_sb_by_chat( struct conversation *c );
-struct msn_switchboard *msn_sb_spare( struct gaim_connection *gc );
+struct msn_switchboard *msn_sb_create( struct im_connection *ic, char *host, int port, char *key, int session );
+struct msn_switchboard *msn_sb_by_handle( struct im_connection *ic, char *handle );
+struct msn_switchboard *msn_sb_by_chat( struct groupchat *c );
+struct msn_switchboard *msn_sb_spare( struct im_connection *ic );
 int msn_sb_sendmessage( struct msn_switchboard *sb, char *text );
-struct conversation *msn_sb_to_chat( struct msn_switchboard *sb );
+struct groupchat *msn_sb_to_chat( struct msn_switchboard *sb );
 void msn_sb_destroy( struct msn_switchboard *sb );
 gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );

protocols/msn/msn_util.c

@@ -28 +28 @@
 #include <ctype.h>
 
-int msn_write( struct gaim_connection *gc, char *s, int len )
-{
-        struct msn_data *md = gc->proto_data;
+int msn_write( struct im_connection *ic, char *s, int len )
+{
+        struct msn_data *md = ic->proto_data;
         int st;
         
@@ -36 +36 @@
         if( st != len )
         {
-                hide_login_progress_error( gc, "Short write() to main server" );
-                signoff( gc );
+                hide_login_progress_error( ic, "Short write() to main server" );
+                signoff( ic );
                 return( 0 );
         }
@@ -44 +44 @@
 }
 
-int msn_logged_in( struct gaim_connection *gc )
-{
-        account_online( gc );
+int msn_logged_in( struct im_connection *ic )
+{
+        account_online( ic );
         
         return( 0 );
 }
 
-int msn_buddy_list_add( struct gaim_connection *gc, char *list, char *who, char *realname_ )
-{
-        struct msn_data *md = gc->proto_data;
+int msn_buddy_list_add( struct im_connection *ic, char *list, char *who, char *realname_ )
+{
+        struct msn_data *md = ic->proto_data;
         char buf[1024], *realname;
         
@@ -59 +59 @@
         
         g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s\r\n", ++md->trId, list, who, realname );
-        if( msn_write( gc, buf, strlen( buf ) ) )
+        if( msn_write( ic, buf, strlen( buf ) ) )
         {
                 g_free( realname );
@@ -71 +71 @@
 }
 
-int msn_buddy_list_remove( struct gaim_connection *gc, char *list, char *who )
-{
-        struct msn_data *md = gc->proto_data;
+int msn_buddy_list_remove( struct im_connection *ic, char *list, char *who )
+{
+        struct msn_data *md = ic->proto_data;
         char buf[1024];
         
         g_snprintf( buf, sizeof( buf ), "REM %d %s %s\r\n", ++md->trId, list, who );
-        if( msn_write( gc, buf, strlen( buf ) ) )
+        if( msn_write( ic, buf, strlen( buf ) ) )
                 return( 1 );
         
@@ -85 +85 @@
 struct msn_buddy_ask_data
 {
-        struct gaim_connection *gc;
+        struct im_connection *ic;
         char *handle;
         char *realname;
@@ -92 +92 @@
 static void msn_buddy_ask_yes( gpointer w, struct msn_buddy_ask_data *bla )
 {
-        msn_buddy_list_add( bla->gc, "AL", bla->handle, bla->realname );
-        
-        if( find_buddy( bla->gc, bla->handle ) == NULL )
-                show_got_added( bla->gc, bla->handle, NULL );
+        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
+        
+        if( find_buddy( bla->ic, bla->handle ) == NULL )
+                show_got_added( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -104 +104 @@
 static void msn_buddy_ask_no( gpointer w, struct msn_buddy_ask_data *bla )
 {
-        msn_buddy_list_add( bla->gc, "BL", bla->handle, bla->realname );
+        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname );
         
         g_free( bla->handle );
@@ -111 +111 @@
 }
 
-void msn_buddy_ask( struct gaim_connection *gc, char *handle, char *realname )
+void msn_buddy_ask( struct im_connection *ic, char *handle, char *realname )
 {
         struct msn_buddy_ask_data *bla = g_new0( struct msn_buddy_ask_data, 1 );
         char buf[1024];
         
-        bla->gc = gc;
+        bla->ic = ic;
         bla->handle = g_strdup( handle );
         bla->realname = g_strdup( realname );
@@ -123 +123 @@
                     "The user %s (%s) wants to add you to his/her buddy list.",
                     handle, realname );
-        do_ask_dialog( gc, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
+        do_ask_dialog( ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
 }
 

protocols/msn/ns.c

@@ -38 +38 @@
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
 {
-        struct gaim_connection *gc = data;
+        struct im_connection *ic = data;
         struct msn_data *md;
         char s[1024];
         
-        if( !g_slist_find( msn_connections, gc ) )
+        if( !g_slist_find( msn_connections, ic ) )
                 return FALSE;
         
         if( source == -1 )
         {
-                hide_login_progress( gc, "Could not connect to server" );
-                signoff( gc );
+                hide_login_progress( ic, "Could not connect to server" );
+                signoff( ic );
                 return FALSE;
         }
         
-        md = gc->proto_data;
+        md = ic->proto_data;
         
         if( !md->handler )
         {
                 md->handler = g_new0( struct msn_handler_data, 1 );
-                md->handler->data = gc;
+                md->handler->data = ic;
                 md->handler->exec_command = msn_ns_command;
                 md->handler->exec_message = msn_ns_message;
@@ -73 +73 @@
         
         g_snprintf( s, sizeof( s ), "VER %d MSNP8 CVR0\r\n", ++md->trId );
-        if( msn_write( gc, s, strlen( s ) ) )
-        {
-                gc->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, gc );
-                set_login_progress( gc, 1, "Connected to server, waiting for reply" );
+        if( msn_write( ic, s, strlen( s ) ) )
+        {
+                ic->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, ic );
+                set_login_progress( ic, 1, "Connected to server, waiting for reply" );
         }
         
@@ -84 +84 @@
 static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond )
 {
-        struct gaim_connection *gc = data;
-        struct msn_data *md = gc->proto_data;
+        struct im_connection *ic = data;
+        struct msn_data *md = ic->proto_data;
         
         if( msn_handler( md->handler ) == -1 ) /* Don't do this on ret == 0, it's already done then. */
         {
-                hide_login_progress( gc, "Error while reading from server" );
-                signoff( gc );
+                hide_login_progress( ic, "Error while reading from server" );
+                signoff( ic );
                 
                 return FALSE;
@@ -100 +100 @@
 static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 {
-        struct gaim_connection *gc = data;
-        struct msn_data *md = gc->proto_data;
+        struct im_connection *ic = data;
+        struct msn_data *md = ic->proto_data;
         char buf[1024];
         
@@ -114 +114 @@
                 if( cmd[2] && strncmp( cmd[2], "MSNP8", 5 ) != 0 )
                 {
-                        hide_login_progress( gc, "Unsupported protocol" );
-                        signoff( gc );
+                        hide_login_progress( ic, "Unsupported protocol" );
+                        signoff( ic );
                         return( 0 );
                 }
                 
                 g_snprintf( buf, sizeof( buf ), "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
-                                                ++md->trId, gc->username );
-                return( msn_write( gc, buf, strlen( buf ) ) );
+                                                ++md->trId, ic->username );
+                return( msn_write( ic, buf, strlen( buf ) ) );
         }
         else if( strcmp( cmd[0], "CVR" ) == 0 )
         {
                 /* We don't give a damn about the information we just received */
-                g_snprintf( buf, sizeof( buf ), "USR %d TWN I %s\r\n", ++md->trId, gc->username );
-                return( msn_write( gc, buf, strlen( buf ) ) );
+                g_snprintf( buf, sizeof( buf ), "USR %d TWN I %s\r\n", ++md->trId, ic->username );
+                return( msn_write( ic, buf, strlen( buf ) ) );
         }
         else if( strcmp( cmd[0], "XFR" ) == 0 )
@@ -136 +136 @@
                 if( num_parts == 6 && strcmp( cmd[2], "NS" ) == 0 )
                 {
-                        b_event_remove( gc->inpa );
-                        gc->inpa = 0;
+                        b_event_remove( ic->inpa );
+                        ic->inpa = 0;
                         closesocket( md->fd );
                         
@@ -143 +143 @@
                         if( !server )
                         {
-                                hide_login_progress_error( gc, "Syntax error" );
-                                signoff( gc );
+                                hide_login_progress_error( ic, "Syntax error" );
+                                signoff( ic );
                                 return( 0 );
                         }
@@ -151 +151 @@
                         server = cmd[3];
                         
-                        set_login_progress( gc, 1, "Transferring to other server" );
-                        
-                        md->fd = proxy_connect( server, port, msn_ns_connected, gc );
+                        set_login_progress( ic, 1, "Transferring to other server" );
+                        
+                        md->fd = proxy_connect( server, port, msn_ns_connected, ic );
                 }
                 else if( num_parts == 6 && strcmp( cmd[2], "SB" ) == 0 )
@@ -162 +162 @@
                         if( !server )
                         {
-                                hide_login_progress_error( gc, "Syntax error" );
-                                signoff( gc );
+                                hide_login_progress_error( ic, "Syntax error" );
+                                signoff( ic );
                                 return( 0 );
                         }
@@ -172 +172 @@
                         if( strcmp( cmd[4], "CKI" ) != 0 )
                         {
-                                hide_login_progress_error( gc, "Unknown authentication method for switchboard" );
-                                signoff( gc );
+                                hide_login_progress_error( ic, "Unknown authentication method for switchboard" );
+                                signoff( ic );
                                 return( 0 );
                         }
                         
                         debug( "Connecting to a new switchboard with key %s", cmd[5] );
-                        sb = msn_sb_create( gc, server, port, cmd[5], MSN_SB_NEW );
+                        sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW );
                         
                         if( md->msgq )
@@ -204 +204 @@
                 else
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -214 +214 @@
                 {
                         /* Time for some Passport black magic... */
-                        if( !passport_get_id( msn_auth_got_passport_id, gc, gc->username, gc->password, cmd[4] ) )
-                        {
-                                hide_login_progress_error( gc, "Error while contacting Passport server" );
-                                signoff( gc );
+                        if( !passport_get_id( msn_auth_got_passport_id, ic, ic->username, ic->password, cmd[4] ) )
+                        {
+                                hide_login_progress_error( ic, "Error while contacting Passport server" );
+                                signoff( ic );
                                 return( 0 );
                         }
@@ -227 +227 @@
                         http_decode( cmd[4] );
                         
-                        strncpy( gc->displayname, cmd[4], sizeof( gc->displayname ) );
-                        gc->displayname[sizeof(gc->displayname)-1] = 0;
-                        
-                        if( ( s = set_find( &gc->acc->set, "display_name" ) ) )
+                        strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
+                        ic->displayname[sizeof(ic->displayname)-1] = 0;
+                        
+                        if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
                         {
                                 g_free( s->value );
@@ -236 +236 @@
                         }
                         
-                        set_login_progress( gc, 1, "Authenticated, getting buddy list" );
+                        set_login_progress( ic, 1, "Authenticated, getting buddy list" );
                         
                         g_snprintf( buf, sizeof( buf ), "SYN %d 0\r\n", ++md->trId );
-                        return( msn_write( gc, buf, strlen( buf ) ) );
+                        return( msn_write( ic, buf, strlen( buf ) ) );
                 }
                 else
                 {
-                        hide_login_progress( gc, "Unknown authentication type" );
-                        signoff( gc );
+                        hide_login_progress( ic, "Unknown authentication type" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -252 +252 @@
                 if( num_parts != 4 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -261 +261 @@
                 if( md->handler->msglen <= 0 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -276 +276 @@
                         
                         if( !*cmd[3] || md->buddycount == 0 )
-                                msn_logged_in( gc );
+                                msn_logged_in( ic );
                 }
                 else
@@ -283 +283 @@
                            Let's assume everything is okay. */
                         
-                        msn_logged_in( gc );
+                        msn_logged_in( ic );
                 }
         }
@@ -292 +292 @@
                 if( num_parts != 4 && num_parts != 5 )
                 {
-                        hide_login_progress( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -308 +308 @@
                                 group = md->grouplist[num];
                         
-                        add_buddy( gc, group, cmd[1], cmd[2] );
+                        add_buddy( ic, group, cmd[1], cmd[2] );
                 }
                 if( list & 2 ) /* AL */
                 {
-                        gc->permit = g_slist_append( gc->permit, g_strdup( cmd[1] ) );
+                        ic->permit = g_slist_append( ic->permit, g_strdup( cmd[1] ) );
                 }
                 if( list & 4 ) /* BL */
                 {
-                        gc->deny = g_slist_append( gc->deny, g_strdup( cmd[1] ) );
+                        ic->deny = g_slist_append( ic->deny, g_strdup( cmd[1] ) );
                 }
                 if( list & 8 ) /* RL */
                 {
                         if( ( list & 6 ) == 0 )
-                                msn_buddy_ask( gc, cmd[1], cmd[2] );
+                                msn_buddy_ask( ic, cmd[1], cmd[2] );
                 }
                 
                 if( --md->buddycount == 0 )
                 {
-                        if( gc->flags & OPT_LOGGED_IN )
-                        {
-                                serv_got_crap( gc, "Successfully transferred to different server" );
+                        if( ic->flags & OPT_LOGGED_IN )
+                        {
+                                serv_got_crap( ic, "Successfully transferred to different server" );
                                 g_snprintf( buf, sizeof( buf ), "CHG %d %s %d\r\n", ++md->trId, md->away_state->code, 0 );
-                                return( msn_write( gc, buf, strlen( buf ) ) );
+                                return( msn_write( ic, buf, strlen( buf ) ) );
                         }
                         else
                         {
-                                msn_logged_in( gc );
+                                msn_logged_in( ic );
                         }
                 }
@@ -344 +344 @@
                 if( num_parts != 4 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -363 +363 @@
                 if( num_parts != 3 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -377 +377 @@
                         g_snprintf( buf + strlen( buf ), 3, "%02x", digest[i] );
                 
-                return( msn_write( gc, buf, strlen( buf ) ) );
+                return( msn_write( ic, buf, strlen( buf ) ) );
         }
         else if( strcmp( cmd[0], "ILN" ) == 0 )
@@ -385 +385 @@
                 if( num_parts != 6 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
                 
                 http_decode( cmd[4] );
-                serv_buddy_rename( gc, cmd[3], cmd[4] );
+                serv_buddy_rename( ic, cmd[3], cmd[4] );
                 
                 st = msn_away_state_by_code( cmd[2] );
@@ -400 +400 @@
                 }
                 
-                serv_got_update( gc, cmd[3], 1, 0, 0, 0, st->number, 0 );
+                serv_got_update( ic, cmd[3], 1, 0, 0, 0, st->number, 0 );
         }
         else if( strcmp( cmd[0], "FLN" ) == 0 )
         {
                 if( cmd[1] )
-                        serv_got_update( gc, cmd[1], 0, 0, 0, 0, 0, 0 );
+                        serv_got_update( ic, cmd[1], 0, 0, 0, 0, 0, 0 );
         }
         else if( strcmp( cmd[0], "NLN" ) == 0 )
@@ -413 +413 @@
                 if( num_parts != 5 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
                 
                 http_decode( cmd[3] );
-                serv_buddy_rename( gc, cmd[2], cmd[3] );
+                serv_buddy_rename( ic, cmd[2], cmd[3] );
                 
                 st = msn_away_state_by_code( cmd[1] );
@@ -428 +428 @@
                 }
                 
-                serv_got_update( gc, cmd[2], 1, 0, 0, 0, st->number, 0 );
+                serv_got_update( ic, cmd[2], 1, 0, 0, 0, st->number, 0 );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )
@@ -438 +438 @@
                 if( num_parts != 7 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -448 +448 @@
                 if( !server )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -458 +458 @@
                 if( strcmp( cmd[3], "CKI" ) != 0 )
                 {
-                        hide_login_progress_error( gc, "Unknown authentication method for switchboard" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Unknown authentication method for switchboard" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -465 +465 @@
                 debug( "Got a call from %s (session %d). Key = %s", cmd[5], session, cmd[4] );
                 
-                sb = msn_sb_create( gc, server, port, cmd[4], session );
+                sb = msn_sb_create( ic, server, port, cmd[4], session );
                 sb->who = g_strdup( cmd[5] );
         }
@@ -478 +478 @@
                         if( strchr( cmd[4], '@' ) == NULL )
                         {
-                                hide_login_progress_error( gc, "Syntax error" );
-                                signoff( gc );
+                                hide_login_progress_error( ic, "Syntax error" );
+                                signoff( ic );
                                 return( 0 );
                         }
                         
                         /* We got added by someone. If we don't have this person in permit/deny yet, inform the user. */
-                        for( l = gc->permit; l; l = l->next )
+                        for( l = ic->permit; l; l = l->next )
                                 if( g_strcasecmp( l->data, cmd[4] ) == 0 )
                                         return( 1 );
                         
-                        for( l = gc->deny; l; l = l->next )
+                        for( l = ic->deny; l; l = l->next )
                                 if( g_strcasecmp( l->data, cmd[4] ) == 0 )
                                         return( 1 );
                         
-                        msn_buddy_ask( gc, cmd[4], cmd[5] );
+                        msn_buddy_ask( ic, cmd[4], cmd[5] );
                 }
         }
@@ -499 +499 @@
                 if( cmd[1] && strcmp( cmd[1], "OTH" ) == 0 )
                 {
-                        hide_login_progress_error( gc, "Someone else logged in with your account" );
-                        gc->wants_to_die = 1;
+                        hide_login_progress_error( ic, "Someone else logged in with your account" );
+                        ic->wants_to_die = 1;
                 }
                 else if( cmd[1] && strcmp( cmd[1], "SSD" ) == 0 )
                 {
-                        hide_login_progress_error( gc, "Terminating session because of server shutdown" );
+                        hide_login_progress_error( ic, "Terminating session because of server shutdown" );
                 }
                 else
                 {
-                        hide_login_progress_error( gc, "Session terminated by remote server (reason unknown)" );
-                }
-                
-                signoff( gc );
+                        hide_login_progress_error( ic, "Session terminated by remote server (reason unknown)" );
+                }
+                
+                signoff( ic );
                 return( 0 );
         }
@@ -518 +518 @@
                 if( num_parts != 5 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
-                        return( 0 );
-                }
-                
-                if( g_strcasecmp( cmd[3], gc->username ) == 0 )
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
+                        return( 0 );
+                }
+                
+                if( g_strcasecmp( cmd[3], ic->username ) == 0 )
                 {
                         set_t *s;
                         
                         http_decode( cmd[4] );
-                        strncpy( gc->displayname, cmd[4], sizeof( gc->displayname ) );
-                        gc->displayname[sizeof(gc->displayname)-1] = 0;
-                        
-                        if( ( s = set_find( &gc->acc->set, "display_name" ) ) )
+                        strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
+                        ic->displayname[sizeof(ic->displayname)-1] = 0;
+                        
+                        if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
                         {
                                 g_free( s->value );
@@ -541 +541 @@
                         /* This is not supposed to happen, but let's handle it anyway... */
                         http_decode( cmd[4] );
-                        serv_buddy_rename( gc, cmd[3], cmd[4] );
+                        serv_buddy_rename( ic, cmd[3], cmd[4] );
                 }
         }
         else if( strcmp( cmd[0], "IPG" ) == 0 )
         {
-                do_error_dialog( gc, "Received IPG command, we don't handle them yet.", "MSN" );
+                do_error_dialog( ic, "Received IPG command, we don't handle them yet.", "MSN" );
                 
                 md->handler->msglen = atoi( cmd[1] );
@@ -552 +552 @@
                 if( md->handler->msglen <= 0 )
                 {
-                        hide_login_progress_error( gc, "Syntax error" );
-                        signoff( gc );
+                        hide_login_progress_error( ic, "Syntax error" );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -563 +563 @@
                 
                 g_snprintf( buf, sizeof( buf ), "Error reported by MSN server: %s", err->text );
-                do_error_dialog( gc, buf, "MSN" );
+                do_error_dialog( ic, buf, "MSN" );
                 
                 if( err->flags & STATUS_FATAL )
                 {
-                        signoff( gc );
+                        signoff( ic );
                         return( 0 );
                 }
@@ -581 +581 @@
 static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts )
 {
-        struct gaim_connection *gc = data;
+        struct im_connection *ic = data;
         char *body;
         int blen = 0;
@@ -617 +617 @@
                                 {
                                         if( arg1 )
-                                                serv_got_crap( gc, "The server is going down for maintenance in %s minutes.", arg1 );
+                                                serv_got_crap( ic, "The server is going down for maintenance in %s minutes.", arg1 );
                                 }
                                 
@@ -634 +634 @@
                                 if( inbox && folders )
                                 {
-                                        serv_got_crap( gc, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+                                        serv_got_crap( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
                                 }
                         }
@@ -644 +644 @@
                                 if( from && fromname )
                                 {
-                                        serv_got_crap( gc, "Received an e-mail message from %s <%s>.", fromname, from );
+                                        serv_got_crap( ic, "Received an e-mail message from %s <%s>.", fromname, from );
                                 }
                         }
@@ -665 +665 @@
 static void msn_auth_got_passport_id( struct passport_reply *rep )
 {
-        struct gaim_connection *gc = rep->data;
-        struct msn_data *md = gc->proto_data;
+        struct im_connection *ic = rep->data;
+        struct msn_data *md = ic->proto_data;
         char *key = rep->result;
         char buf[1024];
@@ -677 +677 @@
                                        rep->error_string ? rep->error_string : "Unknown error" );
                 
-                hide_login_progress( gc, err );
-                signoff( gc );
+                hide_login_progress( ic, err );
+                signoff( ic );
                 
                 g_free( err );
@@ -685 +685 @@
         {
                 g_snprintf( buf, sizeof( buf ), "USR %d TWN S %s\r\n", ++md->trId, key );
-                msn_write( gc, buf, strlen( buf ) );
+                msn_write( ic, buf, strlen( buf ) );
         }
 }

protocols/msn/sb.c

@@ -48 +48 @@
 }
 
-struct msn_switchboard *msn_sb_create( struct gaim_connection *gc, char *host, int port, char *key, int session )
-{
-        struct msn_data *md = gc->proto_data;
+struct msn_switchboard *msn_sb_create( struct im_connection *ic, char *host, int port, char *key, int session )
+{
+        struct msn_data *md = ic->proto_data;
         struct msn_switchboard *sb = g_new0( struct msn_switchboard, 1 );
         
@@ -60 +60 @@
         }
         
-        sb->gc = gc;
+        sb->ic = ic;
         sb->key = g_strdup( key );
         sb->session = session;
@@ -70 +70 @@
 }
 
-struct msn_switchboard *msn_sb_by_handle( struct gaim_connection *gc, char *handle )
-{
-        struct msn_data *md = gc->proto_data;
+struct msn_switchboard *msn_sb_by_handle( struct im_connection *ic, char *handle )
+{
+        struct msn_data *md = ic->proto_data;
         struct msn_switchboard *sb;
         GSList *l;
@@ -86 +86 @@
 }
 
-struct msn_switchboard *msn_sb_by_chat( struct conversation *c )
-{
-        struct msn_data *md = c->gc->proto_data;
+struct msn_switchboard *msn_sb_by_chat( struct groupchat *c )
+{
+        struct msn_data *md = c->ic->proto_data;
         struct msn_switchboard *sb;
         GSList *l;
@@ -102 +102 @@
 }
 
-struct msn_switchboard *msn_sb_spare( struct gaim_connection *gc )
-{
-        struct msn_data *md = gc->proto_data;
+struct msn_switchboard *msn_sb_spare( struct im_connection *ic )
+{
+        struct msn_data *md = ic->proto_data;
         struct msn_switchboard *sb;
         GSList *l;
@@ -142 +142 @@
                 else
                 {
-                        i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->gc->username );
+                        i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->username );
                         buf = g_new0( char, i );
-                        i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->gc->username );
+                        i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->username );
                 }
                 
@@ -177 +177 @@
 }
 
-struct conversation *msn_sb_to_chat( struct msn_switchboard *sb )
-{
-        struct gaim_connection *gc = sb->gc;
+struct groupchat *msn_sb_to_chat( struct msn_switchboard *sb )
+{
+        struct im_connection *ic = sb->ic;
         char buf[1024];
         
         /* Create the groupchat structure. */
         g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
-        sb->chat = serv_got_joined_chat( gc, buf );
+        sb->chat = serv_got_joined_chat( ic, buf );
         
         /* Populate the channel. */
         if( sb->who ) add_chat_buddy( sb->chat, sb->who );
-        add_chat_buddy( sb->chat, gc->username );
+        add_chat_buddy( sb->chat, ic->username );
         
         /* And make sure the switchboard doesn't look like a regular chat anymore. */
@@ -202 +202 @@
 void msn_sb_destroy( struct msn_switchboard *sb )
 {
-        struct gaim_connection *gc = sb->gc;
-        struct msn_data *md = gc->proto_data;
+        struct im_connection *ic = sb->ic;
+        struct msn_data *md = ic->proto_data;
         
         debug( "Destroying switchboard: %s", sb->who ? sb->who : sb->key ? sb->key : "" );
@@ -222 +222 @@
                 g_slist_free( sb->msgq );
                 
-                serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with "
+                serv_got_crap( ic, "Warning: Closing down MSN switchboard connection with "
                                    "unsent message to %s, you'll have to resend it.",
                                    sb->who ? sb->who : "(unknown)" );
@@ -253 +253 @@
 {
         struct msn_switchboard *sb = data;
-        struct gaim_connection *gc;
+        struct im_connection *ic;
         struct msn_data *md;
         char buf[1024];
@@ -261 +261 @@
                 return FALSE;
         
-        gc = sb->gc;
-        md = gc->proto_data;
+        ic = sb->ic;
+        md = ic->proto_data;
         
         if( source != sb->fd )
@@ -280 +280 @@
         
         if( sb->session == MSN_SB_NEW )
-                g_snprintf( buf, sizeof( buf ), "USR %d %s %s\r\n", ++sb->trId, gc->username, sb->key );
+                g_snprintf( buf, sizeof( buf ), "USR %d %s %s\r\n", ++sb->trId, ic->username, sb->key );
         else
-                g_snprintf( buf, sizeof( buf ), "ANS %d %s %s %d\r\n", ++sb->trId, gc->username, sb->key, sb->session );
+                g_snprintf( buf, sizeof( buf ), "ANS %d %s %s %d\r\n", ++sb->trId, ic->username, sb->key, sb->session );
         
         if( msn_sb_write( sb, buf, strlen( buf ) ) )
@@ -310 +310 @@
 {
         struct msn_switchboard *sb = data;
-        struct gaim_connection *gc = sb->gc;
+        struct im_connection *ic = sb->ic;
         char buf[1024];
         
@@ -321 +321 @@
         if( strcmp( cmd[0], "XFR" ) == 0 )
         {
-                hide_login_progress_error( gc, "Received an XFR from a switchboard server, unable to comply! This is likely to be a bug, please report it!" );
-                signoff( gc );
+                hide_login_progress_error( ic, "Received an XFR from a switchboard server, unable to comply! This is likely to be a bug, please report it!" );
+                signoff( ic );
                 return( 0 );
         }
@@ -374 +374 @@
                         {
                                 g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
-                                sb->chat = serv_got_joined_chat( gc, buf );
+                                sb->chat = serv_got_joined_chat( ic, buf );
                                 
                                 g_free( sb->who );
@@ -384 +384 @@
                         if( num == tot )
                         {
-                                add_chat_buddy( sb->chat, gc->username );
+                                add_chat_buddy( sb->chat, ic->username );
                         }
                 }
@@ -529 +529 @@
                 
                 g_snprintf( buf, sizeof( buf ), "Error reported by switchboard server: %s", err->text );
-                do_error_dialog( gc, buf, "MSN" );
+                do_error_dialog( ic, buf, "MSN" );
                 
                 if( err->flags & STATUS_SB_FATAL )
@@ -538 +538 @@
                 else if( err->flags & STATUS_FATAL )
                 {
-                        signoff( gc );
+                        signoff( ic );
                         return 0;
                 }
@@ -579 +579 @@
 {
         struct msn_switchboard *sb = data;
-        struct gaim_connection *gc = sb->gc;
+        struct im_connection *ic = sb->ic;
         char *body;
         int blen = 0;
@@ -608 +608 @@
                         if( sb->who )
                         {
-                                serv_got_im( gc, cmd[1], body, 0, 0, blen );
+                                serv_got_im( ic, cmd[1], body, 0, 0, blen );
                         }
                         else if( sb->chat )
@@ -667 +667 @@
                         if( sb->who )
                         {
-                                serv_got_im( gc, cmd[1], buf, 0, 0, strlen( buf ) );
+                                serv_got_im( ic, cmd[1], buf, 0, 0, strlen( buf ) );
                         }
                         else if( sb->chat )
@@ -684 +684 @@
                         if( who )
                         {
-                                serv_got_typing( gc, who, 5, 1 );
+                                serv_got_typing( ic, who, 5, 1 );
                                 g_free( who );
                         }