Changeset 7825f58

Timestamp:

2010-04-07T18:27:04Z (15 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

3291700

Parents:

ac423d0

Message:

Revert "checkpatch fixes"

This reverts commit a65ec8c459813c84ed9ca57872b0df9add83a049.

17:35 < macmaN> vmiklos: im getting all my groupchat messages as private querys now
17:35 < macmaN> the other direction works
18:48 < macmaN> vmiklos: i've verified it, i went back before that commit and group chats work again

File:

• skype/skype.c (modified) (2 diffs)

skype/skype.c

@@ -509 +509 @@
         *info = '\0';
         info++;
-        if (!strcmp(info, "STATUS RECEIVED") ||
-                !strncmp(info, "EDITED_TIMESTAMP", 16)) {
+        if (!strcmp(info, "STATUS RECEIVED") || !strncmp(info, "EDITED_TIMESTAMP", 16)) {
                 /* New message ID:
                  * (1) Request its from field
@@ -548 +547 @@
                 g_free(sd->type);
                 sd->type = g_strdup(info);
-        } else if (strncmp(info, "CHATNAME ", 9))
-                return;
-        if (!sd->handle || !sd->body || !sd->type)
-                return;
-        info += 9;
-        struct groupchat *gc = skype_chat_by_name(ic, info);
-        int i;
-        for (i = 0; i < g_list_length(sd->body); i++) {
-                char *body = g_list_nth_data(sd->body, i);
-                if (!strcmp(sd->type, "SETTOPIC") && gc)
-                        imcb_chat_topic(gc,
-                                sd->handle, body, 0);
-                else if (!strcmp(sd->type, "LEFT") && gc)
-                        imcb_chat_remove_buddy(gc,
-                                sd->handle, NULL);
-                if (strcmp(sd->type, "SAID") &&
-                        strcmp(sd->type, "EMOTED"))
-                        continue;
-                if (!strcmp(sd->type, "SAID")) {
-                        if (!sd->is_edit)
-                                g_snprintf(buf, IRC_LINE_SIZE, "%s",
-                                        body);
-                        else {
-                                account_t *acc = ic->acc;
-                                g_snprintf(buf, IRC_LINE_SIZE, "%s %s",
-                                        set_getstr(&acc->set, "edit_prefix"),
-                                        body);
-                                sd->is_edit = 0;
+        } else if (!strncmp(info, "CHATNAME ", 9)) {
+                info += 9;
+                if (sd->handle && sd->body && sd->type) {
+                        struct groupchat *gc = skype_chat_by_name(ic, info);
+                        int i;
+                        for (i = 0; i < g_list_length(sd->body); i++) {
+                                char *body = g_list_nth_data(sd->body, i);
+                                if (!strcmp(sd->type, "SAID") ||
+                                        !strcmp(sd->type, "EMOTED")) {
+                                        if (!strcmp(sd->type, "SAID")) {
+                                                if (!sd->is_edit)
+                                                        g_snprintf(buf, IRC_LINE_SIZE, "%s",
+                                                                body);
+                                                else {
+                                                        g_snprintf(buf, IRC_LINE_SIZE, "%s %s",
+                                                                set_getstr(&ic->acc->set, "edit_prefix"),
+                                                                body);
+                                                        sd->is_edit = 0;
+                                                }
+                                        } else
+                                                g_snprintf(buf, IRC_LINE_SIZE, "/me %s",
+                                                        body);
+                                        if (!gc)
+                                                /* Private message */
+                                                imcb_buddy_msg(ic,
+                                                        sd->handle, buf, 0, 0);
+                                        else
+                                                /* Groupchat message */
+                                                imcb_chat_msg(gc,
+                                                        sd->handle, buf, 0, 0);
+                                } else if (!strcmp(sd->type, "SETTOPIC") && gc)
+                                        imcb_chat_topic(gc,
+                                                sd->handle, body, 0);
+                                else if (!strcmp(sd->type, "LEFT") && gc)
+                                        imcb_chat_remove_buddy(gc,
+                                                sd->handle, NULL);
                         }
-                } else
-                        g_snprintf(buf, IRC_LINE_SIZE, "/me %s",
-                                body);
-                if (!gc)
-                        /* Private message */
-                        imcb_buddy_msg(ic,
-                                sd->handle, buf, 0, 0);
-                else
-                        /* Groupchat message */
-                        imcb_chat_msg(gc,
-                                sd->handle, buf, 0, 0);
+                        g_list_free(sd->body);
+                        sd->body = NULL;
+                }
         }
-        g_list_free(sd->body);
-        sd->body = NULL;
 }