Changeset e6298e5

Timestamp:

2012-12-29T10:56:53Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

62a2bf9, eab8e52

Parents:

14d0b02 (diff), 3c7af69 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging Skype fix from vmiklos.

Location:

protocols/skype

Files:

• README (modified) (2 diffs)
• skype.c (modified) (2 diffs)

protocols/skype/README

@@ -31 +31 @@
 == Requirements
 
-* Skype >= 1.4.0.99. The latest version I've tested is 2.1.0.81.
+* Skype >= 1.4.0.99. The latest version I've tested is 2.2.0.35.
 * BitlBee >= 3.0. The latest version I've tested is @BITLBEE_VERSION@. Use
   old versions (see the NEWS file about which one) if you have older BitlBee
@@ -353 +353 @@
 - Group support:
 
+  * To enable: `account skype set read_groups true`
   * Skype groups are told to BitlBee
   * The usual `/invite` in a group channel adds the buddy to the group in skype

protocols/skype/skype.c

@@ -1046 +1046 @@
 static void skype_parse_groups(struct im_connection *ic, char *line)
 {
+        if (!set_getbool(&ic->acc->set, "read_groups"))
+                return;
+
         char **i;
         char **groups = g_strsplit(line + 7, ", ", 0);
@@ -1536 +1539 @@
         s = set_add(&acc->set, "edit_prefix", "EDIT:",
                         NULL, acc);
+
+        s = set_add(&acc->set, "read_groups", "false", set_eval_bool, acc);
 }