Changeset e1d6b38 for protocols

Timestamp:

2013-01-01T16:04:34Z (12 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

757e1e0

Parents:

7764fb1

Message:

skype: make checkpatch happy again (cosmetics)

Location:

protocols/skype

Files:

• Makefile (modified) (1 diff)
• skype.c (modified) (6 diffs)

protocols/skype/Makefile

@@ -62 +62 @@
 # take this from the kernel
 check:
-        perl checkpatch.pl --no-tree --file skype.c
+        perl checkpatch.pl --show-types --ignore LONG_LINE,CAMELCASE --no-tree --file skype.c
 
 test: all

protocols/skype/skype.c

@@ -214 +214 @@
         bla->handle = g_strdup(handle);
 
-        buf = g_strdup_printf("The user %s wants to add you to "
-                "his/her buddy list, saying: '%s'.", handle, message);
+        buf = g_strdup_printf("The user %s wants to add you to his/her buddy list, saying: '%s'.", handle, message);
         imcb_ask(ic, buf, bla, skype_buddy_ask_yes, skype_buddy_ask_no);
         g_free(buf);
@@ -409 +408 @@
                         g_string_free(st, TRUE);
                 }
-        }
-        else if (!strncmp(ptr, "BIRTHDAY ", 9)) {
+        } else if (!strncmp(ptr, "BIRTHDAY ", 9)) {
                 sd->info_birthday = g_strdup(ptr + 9);
 
@@ -566 +564 @@
 }
 
+static void skype_parse_chatmessage_said_emoted(struct im_connection *ic, struct groupchat *gc, char *body)
+{
+        struct skype_data *sd = ic->proto_data;
+        char buf[IRC_LINE_SIZE];
+        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);
+}
+
 static void skype_parse_chatmessage(struct im_connection *ic, char *line)
 {
         struct skype_data *sd = ic->proto_data;
-        char buf[IRC_LINE_SIZE];
         char *id = strchr(line, ' ');
 
@@ -627 +645 @@
                                 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);
+                                        skype_parse_chatmessage_said_emoted(ic, gc, body);
                                 } else if (!strcmp(sd->type, "SETTOPIC") && gc)
                                         imcb_chat_topic(gc,
@@ -716 +714 @@
                 case SKYPE_CALL_RINGING:
                         if (sd->call_out)
-                                imcb_log(ic, "You are currently ringing "
-                                        "the user %s.", info);
+                                imcb_log(ic, "You are currently ringing the user %s.", info);
                         else {
                                 g_snprintf(buf, IRC_LINE_SIZE,
@@ -1231 +1228 @@
         skype_printf(ic, "SET USERSTATUS OFFLINE\n");
 
-        while( ic->groupchats )
+        while (ic->groupchats)
                 imcb_chat_free(ic->groupchats->data);