diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2013-05-01 14:55:50 -0400 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2013-05-01 14:55:50 -0400 |
| commit | f539d6ecaa67f154839669ed6d2a7fe9d24e4ab8 (patch) | |
| tree | 9819ea58158bf1a9dbec8e0bee0971df4ed1049d /protocols/skype/skype.c | |
| parent | dd95ce431b5c85eb6d74e501a7796e8a6016ec70 (diff) | |
| parent | c2a863db316ef3297bf91608854d8b16c1000f2b (diff) | |
Merge from vmiklos.
Diffstat (limited to 'protocols/skype/skype.c')
| -rw-r--r-- | protocols/skype/skype.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/protocols/skype/skype.c b/protocols/skype/skype.c index 7ce562d4..714babf4 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") || @@ -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 @@ -1563,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; |