Changeset f0493b1

Timestamp:

2010-03-19T16:44:46Z (15 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

cc7a153

Parents:

a73d6b2

Message:

checkpatch fixes

File:

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

skype/skype.c

@@ -506 +506 @@
         *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
@@ -544 +545 @@
                 g_free(sd->type);
                 sd->type = g_strdup(info);
-        } 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 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;
                         }
-                        g_list_free(sd->body);
-                        sd->body = 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;
 }