Changeset fa29d093 for protocols/msn/sb.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/sb.c (modified) (9 diffs)

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