Changeset c737ba7 for protocols

Timestamp:

2007-04-22T02:15:36Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

05bcd20, e35d1a1

Parents:

df1fb67

Message:

join_chat root command works for AIM chats now. (Was trivial to add and
useful for testing.)

Location:

protocols

Files:

• nogaim.h (modified) (1 diff)
• oscar/oscar.c (modified) (5 diffs)

protocols/nogaim.h

@@ -164 +164 @@
              (* chat_with)      (struct im_connection *, char *who);
         struct groupchat *
-             (* chat_join)      (struct im_connection *, char *chat, char *nick, char *password);
+             (* chat_join)      (struct im_connection *, char *room, char *nick, char *password);
         
         GList *(* away_states)(struct im_connection *ic);

protocols/oscar/oscar.c

@@ -2530 +2530 @@
 }
 
-int oscar_chat_join(struct im_connection * ic, char * name)
+struct groupchat *oscar_chat_join(struct im_connection * ic, char * room, char * nick, char * password )
 {
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;
-        
         aim_conn_t * cur;
 
         if((cur = aim_getconn_type(od->sess, AIM_CONN_TYPE_CHATNAV))) {
-        
-                return (aim_chatnav_createroom(od->sess, cur, name, 4) == 0);
-        
+                int st;
+                
+                st = aim_chatnav_createroom(od->sess, cur, room, 4);
+                
+                return NULL;
         } else {
                 struct create_room * cr = g_new0(struct create_room, 1);
+                
                 cr->exchange = 4;
-                cr->name = g_strdup(name);
+                cr->name = g_strdup(room);
                 od->create_rooms = g_slist_append(od->create_rooms, cr);
                 aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_CHATNAV);
-                return 1;
+                
+                return NULL;
         }
 }
@@ -2553 +2556 @@
 {
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;
-        int ret;
+        struct groupchat *ret;
         static int chat_id = 0;
         char * chatname;
@@ -2559 +2562 @@
         chatname = g_strdup_printf("%s%d", ic->acc->user, chat_id++);
   
-        ret = oscar_chat_join(ic, chatname);
+        ret = oscar_chat_join(ic, chatname, NULL, NULL);
 
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
@@ -2570 +2573 @@
 void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv)
 {
-        oscar_chat_join(inv->ic, inv->name);
+        oscar_chat_join(inv->ic, inv->name, NULL, NULL);
         g_free(inv->name);
         g_free(inv);
@@ -2600 +2603 @@
         ret->chat_leave = oscar_chat_leave;
         ret->chat_with = oscar_chat_with;
+        ret->chat_join = oscar_chat_join;
         ret->add_permit = oscar_add_permit;
         ret->add_deny = oscar_add_deny;