From 500419b0eefd5b2ab42ba3df82d9b498b843a398 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 21 Apr 2013 21:39:39 +0200 Subject: skype: avoid fake MBERS buddy in groupchats --- protocols/skype/skype.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'protocols/skype/skype.c') diff --git a/protocols/skype/skype.c b/protocols/skype/skype.c index 7ce562d4..30ec9400 100644 --- a/protocols/skype/skype.c +++ b/protocols/skype/skype.c @@ -1015,7 +1015,10 @@ static void skype_parse_chat(struct im_connection *ic, char *line) sd->adder = NULL; } } else if (!strncmp(info, "MEMBERS ", 8) || !strncmp(info, "ACTIVEMEMBERS ", 14) ) { - info += 8; + if (!strncmp(info, "MEMBERS ", 8)) + info += 8; + else + info += 14; gc = bee_chat_by_title(ic->bee, ic, id); /* Hack! We set ->data to TRUE * while we're on the channel -- cgit v1.2.3 From 57b534b1cd734e2e55abc74e7c25401cd821aeda Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 21 Apr 2013 21:39:39 +0200 Subject: skype: ignore empty username (#1045) --- protocols/skype/skype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/skype/skype.c') diff --git a/protocols/skype/skype.c b/protocols/skype/skype.c index 30ec9400..2e56b46b 100644 --- a/protocols/skype/skype.c +++ b/protocols/skype/skype.c @@ -343,11 +343,11 @@ static void skype_parse_user(struct im_connection *ic, char *line) *ptr = '\0'; ptr++; if (!strncmp(ptr, "ONLINESTATUS ", 13)) { - if (!strcmp(user, sd->username)) - return; - if (!set_getbool(&ic->acc->set, "test_join") + if (!strlen(user) || !strcmp(user, sd->username)) + return; + if (!set_getbool(&ic->acc->set, "test_join") && !strcmp(user, "echo123")) - return; + return; ptr = g_strdup_printf("%s@skype.com", user); imcb_add_buddy(ic, ptr, skype_group_by_username(ic, user)); if (strcmp(status, "OFFLINE") && (strcmp(status, "SKYPEOUT") || -- cgit v1.2.3 From c2a863db316ef3297bf91608854d8b16c1000f2b Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 23 Apr 2013 10:06:10 +0200 Subject: skype: fix build --- protocols/skype/skype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'protocols/skype/skype.c') diff --git a/protocols/skype/skype.c b/protocols/skype/skype.c index 2e56b46b..714babf4 100644 --- a/protocols/skype/skype.c +++ b/protocols/skype/skype.c @@ -1566,7 +1566,7 @@ static void skype_init(account_t *acc) s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY; s = set_add(&acc->set, "mood_text", NULL, skype_set_mood_text, acc); - s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY; + s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY; s = set_add(&acc->set, "call", NULL, skype_set_call, acc); s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY; -- cgit v1.2.3