diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2012-12-29 11:56:53 +0100 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2012-12-29 11:56:53 +0100 |
commit | e6298e5a2b57a12ff0a10e15030823af89c734cb (patch) | |
tree | ede574a14e5df268f51cf6022f66d7baf092bb47 | |
parent | 14d0b021045b5d92939a795fc244f0b12a66726a (diff) | |
parent | 3c7af69632578033cc7dfb1b8fa83ee4c1221b97 (diff) |
Merging Skype fix from vmiklos.
-rw-r--r-- | protocols/skype/README | 3 | ||||
-rw-r--r-- | protocols/skype/skype.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/protocols/skype/README b/protocols/skype/README index 2c962d54..95ac0475 100644 --- a/protocols/skype/README +++ b/protocols/skype/README @@ -30,7 +30,7 @@ not..) == 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 installed. @@ -352,6 +352,7 @@ $ skyped -n -d - 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 as well (and if necessary, it creates a new group in Skype) diff --git a/protocols/skype/skype.c b/protocols/skype/skype.c index 6515a801..60471d01 100644 --- a/protocols/skype/skype.c +++ b/protocols/skype/skype.c @@ -1045,6 +1045,9 @@ static void skype_parse_chats(struct im_connection *ic, char *line) 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); @@ -1535,6 +1538,8 @@ static void skype_init(account_t *acc) s = set_add(&acc->set, "edit_prefix", "EDIT:", NULL, acc); + + s = set_add(&acc->set, "read_groups", "false", set_eval_bool, acc); } #if BITLBEE_VERSION_CODE > BITLBEE_VER(3, 0, 1) |