Changeset fa29d093 for protocols/yahoo

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.

File:

• protocols/yahoo/yahoo.c (modified) (8 diffs)

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