Changeset 03f3828 for protocols/oscar

Timestamp:

2010-07-24T14:06:22Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7989d40d

Parents:

c8791f2

Message:

Adding protocol-specific chatroom settings. First one to use this: AIM
chatrooms to use exchange numbers other than 4.

File:

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

protocols/oscar/oscar.c

@@ -2506 +2506 @@
 }
 
-struct groupchat *oscar_chat_join(struct im_connection * ic, const char * room, const char * nick, const char * password )
+struct groupchat *oscar_chat_join_internal(struct im_connection *ic, const char *room,
+        const char *nick, const char *password, int exchange_number)
 {
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;
@@ -2514 +2515 @@
                 int st;
                 
-                st = aim_chatnav_createroom(od->sess, cur, room, 4);
+                st = aim_chatnav_createroom(od->sess, cur, room, exchange_number);
                 
                 return NULL;
@@ -2520 +2521 @@
                 struct create_room * cr = g_new0(struct create_room, 1);
                 
-                cr->exchange = 4;
+                cr->exchange = exchange_number;
                 cr->name = g_strdup(room);
                 od->create_rooms = g_slist_append(od->create_rooms, cr);
@@ -2529 +2530 @@
 }
 
+struct groupchat *oscar_chat_join(struct im_connection *ic, const char *room,
+        const char *nick, const char *password, set_t **sets)
+{
+        return oscar_chat_join_internal(ic, room, nick, password, set_getint(sets, "exchange_number"));
+}
+
 struct groupchat *oscar_chat_with(struct im_connection * ic, char *who)
 {
@@ -2545 +2552 @@
         
         c = imcb_chat_new(ic, chatname);
-        ret = oscar_chat_join(ic, chatname, NULL, NULL);
+        ret = oscar_chat_join_internal(ic, chatname, NULL, NULL, 4);
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
 
@@ -2557 +2564 @@
         struct aim_chat_invitation * inv = data;
         
-        oscar_chat_join(inv->ic, inv->name, NULL, NULL);
+        oscar_chat_join_internal(inv->ic, inv->name, NULL, NULL, 4);
         g_free(inv->name);
         g_free(inv);
@@ -2568 +2575 @@
         g_free(inv->name);
         g_free(inv);
+}
+
+void oscar_chat_add_settings(account_t *acc, set_t **head)
+{
+        set_add(head, "exchange_number", "4", set_eval_int, NULL);
+}
+
+void oscar_chat_free_settings(account_t *acc, set_t **head)
+{
+        set_del(head, "exchange_number");
 }
 
@@ -2590 +2607 @@
         ret->chat_with = oscar_chat_with;
         ret->chat_join = oscar_chat_join;
+        ret->chat_add_settings = oscar_chat_add_settings;
+        ret->chat_free_settings = oscar_chat_free_settings;
         ret->add_permit = oscar_add_permit;
         ret->add_deny = oscar_add_deny;