Changeset fa29d093 for protocols/msn

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.

Location:

protocols/msn

Files:

• msn.c (modified) (7 diffs)
• msn.h (modified) (1 diff)
• sb.c (modified) (9 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;
 }
 

protocols/msn/msn.h

@@ -169 +169 @@
 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_id( struct gaim_connection *gc, int id );
+struct msn_switchboard *msn_sb_by_chat( struct conversation *c );
 struct msn_switchboard *msn_sb_spare( struct gaim_connection *gc );
 int msn_sb_sendmessage( struct msn_switchboard *sb, char *text );
-void msn_sb_to_chat( struct msn_switchboard *sb );
+struct conversation *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/sb.c

@@ -86 +86 @@
 }
 
-struct msn_switchboard *msn_sb_by_id( struct gaim_connection *gc, int id )
-{
-        struct msn_data *md = gc->proto_data;
+struct msn_switchboard *msn_sb_by_chat( struct conversation *c )
+{
+        struct msn_data *md = c->gc->proto_data;
         struct msn_switchboard *sb;
         GSList *l;
@@ -95 +95 @@
         {
                 sb = l->data;
-                if( sb->chat && sb->chat->id == id )
+                if( sb->chat == c )
                         return( sb );
         }
@@ -177 +177 @@
 }
 
-void msn_sb_to_chat( struct msn_switchboard *sb )
+struct conversation *msn_sb_to_chat( struct msn_switchboard *sb )
 {
         struct gaim_connection *gc = sb->gc;
@@ -184 +184 @@
         /* Create the groupchat structure. */
         g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
-        sb->chat = serv_got_joined_chat( gc, ++msn_chat_id, buf );
+        sb->chat = serv_got_joined_chat( gc, buf );
         
         /* Populate the channel. */
@@ -196 +196 @@
                 sb->who = NULL;
         }
+        
+        return sb->chat;
 }
 
@@ -230 +232 @@
         if( sb->chat )
         {
-                serv_got_chat_left( gc, sb->chat->id );
+                serv_got_chat_left( sb->chat );
         }
         
@@ -372 +374 @@
                         {
                                 g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
-                                sb->chat = serv_got_joined_chat( gc, ++msn_chat_id, buf );
+                                sb->chat = serv_got_joined_chat( gc, buf );
                                 
                                 g_free( sb->who );
@@ -610 +612 @@
                         else if( sb->chat )
                         {
-                                serv_got_chat_in( gc, sb->chat->id, cmd[1], 0, body, 0 );
+                                serv_got_chat_in( sb->chat, cmd[1], 0, body, 0 );
                         }
                         else
@@ -669 +671 @@
                         else if( sb->chat )
                         {
-                                serv_got_chat_in( gc, sb->chat->id, cmd[1], 0, buf, 0 );
+                                serv_got_chat_in( sb->chat, cmd[1], 0, buf, 0 );
                         }
                         else