Changeset fa29d093 for protocols/msn/msn.c

Timestamp:

2007-03-28T05:53:11Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0da65d5

Parents:

723e611

Message:

Preparing for Jabber conference room support.

File:

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

protocols/msn/msn.c

@@ -241 +241 @@
 }
 
-static int msn_chat_send( struct gaim_connection *gc, int id, char *message )
-{
-        struct msn_switchboard *sb = msn_sb_by_id( gc, id );
+static int msn_chat_send( struct conversation *c, char *message )
+{
+        struct msn_switchboard *sb = msn_sb_by_chat( c );
         
         if( sb )
@@ -251 +251 @@
 }
 
-static void msn_chat_invite( struct gaim_connection *gc, int id, char *msg, char *who )
-{
-        struct msn_switchboard *sb = msn_sb_by_id( gc, id );
+static void msn_chat_invite( struct conversation *c, char *msg, char *who )
+{
+        struct msn_switchboard *sb = msn_sb_by_chat( c );
         char buf[1024];
         
@@ -263 +263 @@
 }
 
-static void msn_chat_leave( struct gaim_connection *gc, int id )
-{
-        struct msn_switchboard *sb = msn_sb_by_id( gc, id );
+static void msn_chat_leave( struct conversation *c )
+{
+        struct msn_switchboard *sb = msn_sb_by_chat( c );
         
         if( sb )
@@ -271 +271 @@
 }
 
-static int msn_chat_open( struct gaim_connection *gc, char *who )
+static struct conversation *msn_chat_open( struct gaim_connection *gc, char *who )
 {
         struct msn_switchboard *sb;
@@ -280 +280 @@
         {
                 debug( "Converting existing switchboard to %s to a groupchat", who );
-                msn_sb_to_chat( sb );
-                return( 1 );
+                return msn_sb_to_chat( sb );
         }
         else
@@ -292 +291 @@
                         g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
                         if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                        {
-                                msn_sb_to_chat( sb );
-                                return( 1 );
-                        }
+                                return msn_sb_to_chat( sb );
                 }
                 
@@ -314 +310 @@
                 md->msgq = g_slist_append( md->msgq, m );
                 
-                return( 1 );
-        }
-        
-        return( 0 );
+                /* FIXME: Can I try to return something here already? */
+                return NULL;
+        }
+        
+        return NULL;
 }