Changeset fa29d093 for protocols/nogaim.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/nogaim.c (modified) (11 diffs)

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