Changes in protocols/skype/skype.c [215e171:c2a863d]

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
@@ -1561 +1564 @@
         s = set_add(&acc->set, "display_name", NULL, skype_set_display_name,
                 acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        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 |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "balance", NULL, skype_set_balance, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "skypeout_offline", "true", set_eval_bool, acc);