Changeset f539d6e for protocols/skype/skype.c

Timestamp:

2013-05-01T18:55:50Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

af496d8

Parents:

dd95ce4 (diff), c2a863d (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:

Merge from vmiklos.

File:

• protocols/skype/skype.c (modified) (3 diffs)

protocols/skype/skype.c

@@ -344 +344 @@
         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));
@@ -1016 +1016 @@
                 }
         } 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
@@ -1564 +1567 @@
 
         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);