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

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