Changeset 0da65d5 for protocols/msn/msn_util.c

Timestamp:

2007-03-31T05:40:45Z (17 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. ;-)

File:

• protocols/msn/msn_util.c (modified) (10 diffs)

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 );
 }