Changeset fa29d093

Timestamp:

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

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0da65d5

Parents:

723e611

Message:

Preparing for Jabber conference room support.

Files:

• irc.c (modified) (4 diffs)
• irc_commands.c (modified) (5 diffs)
• motd.txt (modified) (1 diff)
• protocols/msn/msn.c (modified) (7 diffs)
• protocols/msn/msn.h (modified) (1 diff)
• protocols/msn/sb.c (modified) (9 diffs)
• protocols/nogaim.c (modified) (11 diffs)
• protocols/nogaim.h (modified) (5 diffs)
• protocols/oscar/oscar.c (modified) (10 diffs)
• protocols/yahoo/yahoo.c (modified) (8 diffs)
• root_commands.c (modified) (2 diffs)

irc.c

@@ -659 +659 @@
                 }
         }
-        else if( ( c = conv_findchannel( channel ) ) )
+        else if( ( c = chat_by_channel( channel ) ) )
         {
                 GList *l;
@@ -812 +812 @@
         else
         {
-                struct conversation *c = conv_findchannel( channel );
+                struct conversation *c = chat_by_channel( channel );
                 
                 if( c )
@@ -950 +950 @@
         if( *nick == '#' || *nick == '&' )
         {
-                if( !( c = conv_findchannel( nick ) ) )
+                if( !( c = chat_by_channel( nick ) ) )
                 {
                         irc_reply( irc, 403, "%s :Channel does not exist", nick );
@@ -1038 +1038 @@
         else if( c && c->gc && c->gc->acc && c->gc->acc->prpl )
         {
-                return( bim_chat_msg( c->gc, c->id, s ) );
+                return( bim_chat_msg( c, s ) );
         }
         

irc_commands.c

@@ -144 +144 @@
                 irc_join( irc, u, irc->channel );
         }
-        else if( ( c = conv_findchannel( cmd[1] ) ) )
+        else if( ( c = chat_by_channel( cmd[1] ) ) )
         {
                 user_t *u = user_find( irc, irc->nick );
@@ -153 +153 @@
                 {
                         c->joined = 0;
-                        c->gc->acc->prpl->chat_leave( c->gc, c->id );
+                        c->gc->acc->prpl->chat_leave( c );
                 }
         }
@@ -201 +201 @@
 {
         char *nick = cmd[1], *channel = cmd[2];
-        struct conversation *c = conv_findchannel( channel );
+        struct conversation *c = chat_by_channel( channel );
         user_t *u = user_find( irc, nick );
         
@@ -207 +207 @@
                 if( c->gc && c->gc->acc->prpl->chat_invite )
                 {
-                        c->gc->acc->prpl->chat_invite( c->gc, c->id, "", u->handle );
+                        c->gc->acc->prpl->chat_invite( c, "", u->handle );
                         irc_reply( irc, 341, "%s %s", nick, channel );
                         return;
@@ -287 +287 @@
                         u = u->next;
                 }
-        else if( ( c = conv_findchannel( channel ) ) )
+        else if( ( c = chat_by_channel( channel ) ) )
                 for( l = c->in_room; l; l = l->next )
                 {

motd.txt

@@ -14 +14 @@
 The developers of the Bee hope you have a buzzing time.
 
-* BitlBee development team: wilmer, ctrlsoft, Maurits
+* BitlBee development team: wilmer, jelmer, Maurits
  
 ... Buzzing, haha, get it?

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

protocols/nogaim.c

@@ -682 +682 @@
 }
 
-void serv_got_chat_left( struct gaim_connection *gc, int id )
-{
-        struct conversation *c, *l = NULL;
+void serv_got_chat_left( struct conversation *c )
+{
+        struct gaim_connection *gc = c->gc;
+        struct conversation *l = NULL;
         GList *ir;
         
         if( set_getbool( &gc->irc->set, "debug" ) )
-                serv_got_crap( gc, "You were removed from conversation %d", (int) id );
-        
-        for( c = gc->conversations; c && c->id != id; c = (l=c)->next );
+                serv_got_crap( gc, "You were removed from conversation 0x%x", (int) c );
         
         if( c )
@@ -720 +719 @@
 }
 
-void serv_got_chat_in( struct gaim_connection *gc, int id, char *who, int whisper, char *msg, time_t mtime )
-{
-        struct conversation *c;
+void serv_got_chat_in( struct conversation *c, char *who, int whisper, char *msg, time_t mtime )
+{
+        struct gaim_connection *gc = c->gc;
         user_t *u;
         
@@ -730 +729 @@
         
         u = user_findhandle( gc, who );
-        for( c = gc->conversations; c && c->id != id; c = c->next );
         
         if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
@@ -739 +737 @@
                 irc_privmsg( gc->irc, u, "PRIVMSG", c->channel, "", msg );
         else
-                serv_got_crap( gc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg );
-}
-
-struct conversation *serv_got_joined_chat( struct gaim_connection *gc, int id, char *handle )
+                serv_got_crap( gc, "Message from/to conversation %s@0x%x (unknown conv/user): %s", who, (int) c, msg );
+}
+
+struct conversation *serv_got_joined_chat( struct gaim_connection *gc, char *handle )
 {
         struct conversation *c;
-        char *s;
         
         /* This one just creates the conversation structure, user won't see anything yet */
@@ -755 +752 @@
         }
         else
-                gc->conversations = c = g_new0( struct conversation, 1);
-        
-        c->id = id;
+                gc->conversations = c = g_new0( struct conversation, 1 );
+        
         c->gc = gc;
         c->title = g_strdup( handle );
-        
-        s = g_new( char, 16 );
-        sprintf( s, "&chat_%03d", gc->irc->c_id++ );
-        c->channel = g_strdup( s );
-        g_free( s );
+        c->channel = g_strdup_printf( "&chat_%03d", gc->irc->c_id++ );
         
         if( set_getbool( &gc->irc->set, "debug" ) )
-                serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
-        
-        return( c );
+                serv_got_crap( gc, "Creating new conversation: (id=0x%x,handle=%s)", (int) c, handle );
+        
+        return c;
 }
 
@@ -781 +773 @@
         
         if( set_getbool( &b->gc->irc->set, "debug" ) )
-                serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
+                serv_got_crap( b->gc, "User %s added to conversation 0x%x", handle, (int) b );
         
         /* It might be yourself! */
@@ -815 +807 @@
         
         if( set_getbool( &b->gc->irc->set, "debug" ) )
-                serv_got_crap( b->gc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
+                serv_got_crap( b->gc, "User %s removed from conversation 0x%x (%s)", handle, (int) b, reason ? reason : "" );
         
         /* It might be yourself! */
@@ -858 +850 @@
 /* Misc. BitlBee stuff which shouldn't really be here */
 
-struct conversation *conv_findchannel( char *channel )
+struct conversation *chat_by_channel( char *channel )
 {
         struct gaim_connection *gc;
@@ -870 +862 @@
                 for( c = gc->conversations; c && g_strcasecmp( c->channel, channel ) != 0; c = c->next );
                 if( c )
-                        return( c );
-        }
-        
-        return( NULL );
+                        return c;
+        }
+        
+        return NULL;
 }
 
@@ -958 +950 @@
 }
 
-int bim_chat_msg( struct gaim_connection *gc, int id, char *msg )
+int bim_chat_msg( struct conversation *c, char *msg )
 {
         char *buf = NULL;
         int st;
         
-        if( ( gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        if( ( c->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
         {
                 buf = escape_html( msg );
@@ -969 +961 @@
         }
         
-        st = gc->acc->prpl->chat_send( gc, id, msg );
+        st = c->gc->acc->prpl->chat_send( c, msg );
         g_free( buf );
         

protocols/nogaim.h

@@ -100 +100 @@
 
         /* stuff used just for chat */
-        GList *in_room;
-        GList *ignored;
-        int id;
-        
-        /* BitlBee */
-        struct conversation *next;
-        char *channel;
-        char *title;
-        char joined;
-        void *data;
+        GList *in_room;
+        GList *ignored;
+        
+        /* BitlBee */
+        struct conversation *next;
+        char *channel;
+        char *title;
+        char joined;
+        void *data;
 };
 
@@ -115 +114 @@
         char name[80];
         char show[BUDDY_ALIAS_MAXLEN];
-        int present;
+        int present;
         int evil;
         time_t signon;
         time_t idle;
-        int uc;
+        int uc;
         guint caps; /* woohoo! */
         void *proto_data; /* what a hack */
@@ -153 +152 @@
         
         /* Group chat stuff. */
-        void (* join_chat)      (struct gaim_connection *, GList *data);
-        void (* chat_invite)    (struct gaim_connection *, int id, char *who, char *message);
-        void (* chat_leave)     (struct gaim_connection *, int id);
-        int  (* chat_send)      (struct gaim_connection *, int id, char *message);
-        int  (* chat_open)      (struct gaim_connection *, char *who);
+        void (* chat_invite)    (struct conversation *, char *who, char *message);
+        void (* chat_leave)     (struct conversation *);
+        int  (* chat_send)      (struct conversation *, char *message);
+        struct conversation *
+             (* chat_open)      (struct gaim_connection *, char *who);
+        struct conversation *
+             (* chat_join)      (struct gaim_connection *, char *chat, char *nick, char *password);
         
         /* DIE! */
@@ -183 +184 @@
 int bim_set_away( struct gaim_connection *gc, char *away );
 int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags );
-int bim_chat_msg( struct gaim_connection *gc, int id, char *msg );
+int bim_chat_msg( struct conversation *c, char *msg );
 
 void bim_add_allow( struct gaim_connection *gc, char *handle );
@@ -224 +225 @@
 G_MODULE_EXPORT void show_got_added( struct gaim_connection *gc, char *handle, const char *realname );
 
-/* server.c */                    
+/* server.c */
 G_MODULE_EXPORT void serv_got_update( struct gaim_connection *gc, char *handle, int loggedin, int evil, time_t signon, time_t idle, int type, guint caps );
 G_MODULE_EXPORT void serv_got_im( struct gaim_connection *gc, char *handle, char *msg, guint32 flags, time_t mtime, gint len );
 G_MODULE_EXPORT void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout, int type );
 G_MODULE_EXPORT void serv_got_chat_invite( struct gaim_connection *gc, char *handle, char *who, char *msg, GList *data );
-G_MODULE_EXPORT struct conversation *serv_got_joined_chat( struct gaim_connection *gc, int id, char *handle );
-G_MODULE_EXPORT void serv_got_chat_in( struct gaim_connection *gc, int id, char *who, int whisper, char *msg, time_t mtime );
-G_MODULE_EXPORT void serv_got_chat_left( struct gaim_connection *gc, int id );
-
-struct conversation *conv_findchannel( char *channel );
+G_MODULE_EXPORT struct conversation *serv_got_joined_chat( struct gaim_connection *gc, char *handle );
+G_MODULE_EXPORT void serv_got_chat_in( struct conversation *c, char *who, int whisper, char *msg, time_t mtime );
+G_MODULE_EXPORT void serv_got_chat_left( struct conversation *c );
+
+struct conversation *chat_by_channel( char *channel );
+struct conversation *chat_by_id( int id );
 
 #endif

protocols/oscar/oscar.c

@@ -157 +157 @@
         return tmp;
 }
-
-static struct chat_connection *find_oscar_chat(struct gaim_connection *gc, int id) {
-        GSList *g = ((struct oscar_data *)gc->proto_data)->oscar_chats;
-        struct chat_connection *c = NULL;
-
-        while (g) {
-                c = (struct chat_connection *)g->data;
-                if (c->id == id)
-                        break;
-                g = g->next;
-                c = NULL;
-        }
-
-        return c;
-}
-
 
 static struct chat_connection *find_oscar_chat_by_conn(struct gaim_connection *gc,
@@ -769 +753 @@
         chatcon = find_oscar_chat_by_conn(gc, fr->conn);
         chatcon->id = id;
-        chatcon->cnv = serv_got_joined_chat(gc, id++, chatcon->show);
+        chatcon->cnv = serv_got_joined_chat(gc, chatcon->show);
+        chatcon->cnv->data = chatcon;
 
         return 1;
@@ -1580 +1565 @@
         tmp = g_malloc(BUF_LONG);
         g_snprintf(tmp, BUF_LONG, "%s", msg);
-        serv_got_chat_in(gc, ccon->id, info->sn, 0, tmp, time((time_t)NULL));
+        serv_got_chat_in(ccon->cnv, info->sn, 0, tmp, time((time_t)NULL));
         g_free(tmp);
 
@@ -2521 +2506 @@
 }
 
-int oscar_chat_send(struct gaim_connection * gc, int id, char *message)
-{
+int oscar_chat_send(struct conversation *c, char *message)
+{
+        struct gaim_connection *gc = c->gc;
         struct oscar_data * od = (struct oscar_data*)gc->proto_data;
         struct chat_connection * ccon;
@@ -2530 +2516 @@
         char *s;
         
-        if(!(ccon = find_oscar_chat(gc, id)))
-                return -1;
+        ccon = c->data;
                 
         for (s = message; *s; s++)
@@ -2568 +2553 @@
 }
 
-void oscar_chat_invite(struct gaim_connection * gc, int id, char *message, char *who)
-{
+void oscar_chat_invite(struct conversation *c, char *message, char *who)
+{
+        struct gaim_connection *gc = c->gc;
         struct oscar_data * od = (struct oscar_data *)gc->proto_data;
-        struct chat_connection *ccon = find_oscar_chat(gc, id);
-        
-        if (ccon == NULL)
-                return;
+        struct chat_connection *ccon = c->data;
         
         aim_chat_invite(od->sess, od->conn, who, message ? message : "",
@@ -2585 +2568 @@
 
         /* Notify the conversation window that we've left the chat */
-        serv_got_chat_left(gc, cc->id);
+        serv_got_chat_left(cc->cnv);
 
         /* Destroy the chat_connection */
@@ -2597 +2580 @@
 }
 
-void oscar_chat_leave(struct gaim_connection * gc, int id)
-{
-        struct chat_connection * ccon = find_oscar_chat(gc, id);
-
-        if(ccon == NULL)
-                return;
-
-        oscar_chat_kill(gc, ccon);
+void oscar_chat_leave(struct conversation *c)
+{
+        oscar_chat_kill(c->gc, c->data);
 }
 
 int oscar_chat_join(struct gaim_connection * gc, char * name)
 {
-    struct oscar_data * od = (struct oscar_data *)gc->proto_data;
+        struct oscar_data * od = (struct oscar_data *)gc->proto_data;
         
         aim_conn_t * cur;
@@ -2627 +2605 @@
 }
 
-int oscar_chat_open(struct gaim_connection * gc, char *who)
+struct conversation *oscar_chat_open(struct gaim_connection * gc, char *who)
 {
         struct oscar_data * od = (struct oscar_data *)gc->proto_data;
@@ -2642 +2620 @@
         g_free(chatname);
         
-        return ret;
+        return NULL;
 }
 

protocols/yahoo/yahoo.c

@@ -140 +140 @@
         
         while( gc->conversations )
-                serv_got_chat_left( gc, gc->conversations->id );
+                serv_got_chat_left( gc->conversations );
         
         for( l = yd->buddygroups; l; l = l->next )
@@ -332 +332 @@
 }
 
-static int byahoo_chat_send( struct gaim_connection *gc, int id, char *message )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && c->id != id; c = c->next );
-
+static int byahoo_chat_send( struct conversation *c, char *message )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) c->gc->proto_data;
+        
         yahoo_conference_message( yd->y2_id, NULL, c->data, c->title, message, 1 );
         
@@ -344 +341 @@
 }
 
-static void byahoo_chat_invite( struct gaim_connection *gc, int id, char *msg, char *who )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && c->id != id; c = c->next );
+static void byahoo_chat_invite( struct conversation *c, char *msg, char *who )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) c->gc->proto_data;
         
         yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg );
 }
 
-static void byahoo_chat_leave( struct gaim_connection *gc, int id )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && c->id != id; c = c->next );
+static void byahoo_chat_leave( struct conversation *c )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) c->gc->proto_data;
         
         yahoo_conference_logoff( yd->y2_id, NULL, c->data, c->title );
-        serv_got_chat_left( gc, c->id );
-}
-
-static int byahoo_chat_open( struct gaim_connection *gc, char *who )
+        serv_got_chat_left( c );
+}
+
+static struct conversation *byahoo_chat_open( struct gaim_connection *gc, char *who )
 {
         struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
@@ -375 +366 @@
         g_snprintf( roomname, strlen( gc->username ) + 16, "%s-Bee-%d", gc->username, byahoo_chat_id );
         
-        c = serv_got_joined_chat( gc, ++byahoo_chat_id, roomname );
+        c = serv_got_joined_chat( gc, roomname );
         add_chat_buddy( c, gc->username );
         
@@ -387 +378 @@
         g_free( roomname );
         
-        return( 1 );
+        return c;
 }
 
@@ -805 +796 @@
 {
         yahoo_conference_decline( inv->yid, NULL, inv->members, inv->name, "User rejected groupchat" );
-        serv_got_chat_left( inv->gc, inv->c->id );
+        serv_got_chat_left( inv->c );
         g_free( inv->name );
         g_free( inv );
@@ -820 +811 @@
         memset( inv, 0, sizeof( struct byahoo_conf_invitation ) );
         inv->name = g_strdup( room );
-        inv->c = serv_got_joined_chat( gc, ++byahoo_chat_id, room );
+        inv->c = serv_got_joined_chat( gc, room );
         inv->c->data = members;
         inv->yid = id;
@@ -872 +863 @@
         for( c = gc->conversations; c && strcmp( c->title, room ) != 0; c = c->next );
         
-        serv_got_chat_in( gc, c ? c->id : 0, who, 0, m, 0 );
+        if( c )
+                serv_got_chat_in( c, who, 0, m, 0 );
         g_free( m );
 }

root_commands.c

@@ -883 +883 @@
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
+}
+
+static void cmd_join_chat( irc_t *irc, char **cmd )
+{
+        account_t *a;
+        struct gaim_connection *gc;
+        char *chat, *channel, *nick = NULL, *password = NULL;
+        struct conversation *c;
+        
+        if( !( a = account_get( irc, cmd[1] ) ) )
+        {
+                irc_usermsg( irc, "Invalid account" );
+                return;
+        }
+        else if( !( a->gc && ( a->gc->flags & OPT_LOGGED_IN ) ) )
+        {
+                irc_usermsg( irc, "That account is not on-line" );
+                return;
+        }
+        else if( a->prpl->chat_join == NULL )
+        {
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                return;
+        }
+        gc = a->gc;
+        
+        chat = cmd[2];
+        if( cmd[3] )
+        {
+                channel = g_strdup( cmd[3] );
+        }
+        else
+        {
+                char *s;
+                
+                channel = g_strdup( chat );
+                if( ( s = strchr( channel, '@' ) ) )
+                        *s = 0;
+        }
+        if( cmd[3] && cmd[4] )
+                nick = cmd[4];
+        if( cmd[3] && cmd[4] && cmd[5] )
+                password = cmd[5];
+        
+        c = a->prpl->chat_join( gc, chat, nick, password );
+        
+        g_free( channel );
 }
 
@@ -904 +951 @@
         { "nick",           1, cmd_nick,           0 },
         { "qlist",          0, cmd_qlist,          0 },
+        { "join_chat",      2, cmd_join_chat,      0 },
         { NULL }
 };