Changeset 29ff5c2 for protocols/skype/skype.c

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (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 branch 'master' into feat/hip-cat

File:

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

protocols/skype/skype.c

@@ -21 +21 @@
 
 #define _XOPEN_SOURCE
-#define _BSD_SOURCE
 #include <poll.h>
 #include <stdio.h>
@@ -188 +187 @@
 
         va_start(args, fmt);
-        vsnprintf(str, IRC_LINE_SIZE, fmt, args);
+        g_vsnprintf(str, IRC_LINE_SIZE, fmt, args);
         va_end(args);
 
@@ -322 +321 @@
         }
         return NULL;
+}
+
+static struct groupchat *skype_chat_get_or_create(struct im_connection *ic, char *id)
+{
+        struct skype_data *sd = ic->proto_data;
+        struct groupchat *gc = bee_chat_by_title(ic->bee, ic, id);
+
+        if (!gc) {
+                gc = imcb_chat_new(ic, id);
+                imcb_chat_name_hint(gc, id);
+                imcb_chat_add_buddy(gc, sd->username);
+
+                skype_printf(ic, "GET CHAT %s ADDER\n", id);
+                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
+                skype_printf(ic, "GET CHAT %s ACTIVEMEMBERS\n", id);
+        }
+
+        return gc;
 }
 
@@ -688 +705 @@
                 info += 9;
                 if (sd->handle && sd->body && sd->type) {
-                        struct groupchat *gc = bee_chat_by_title(ic->bee, ic, info);
+                        struct groupchat *gc = skype_chat_get_or_create(ic, info);
                         int i;
                         for (i = 0; i < g_list_length(sd->body); i++) {
@@ -1026 +1043 @@
         }
         if (!strcmp(info, "STATUS MULTI_SUBSCRIBED")) {
-                gc = bee_chat_by_title(ic->bee, ic, id);
-                if (!gc) {
-                        gc = imcb_chat_new(ic, id);
-                        imcb_chat_name_hint(gc, id);
-                }
-                skype_printf(ic, "GET CHAT %s ADDER\n", id);
-                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
+                skype_chat_get_or_create(ic, id);
         } else if (!strcmp(info, "STATUS DIALOG") && sd->groupchat_with) {
-                gc = imcb_chat_new(ic, id);
-                imcb_chat_name_hint(gc, id);
+                gc = skype_chat_get_or_create(ic, id);
                 /* According to the docs this
                  * is necessary. However it
@@ -1046 +1056 @@
                            sd->groupchat_with);
                 imcb_chat_add_buddy(gc, buf);
-                imcb_chat_add_buddy(gc, sd->username);
                 g_free(sd->groupchat_with);
                 sd->groupchat_with = NULL;
-                skype_printf(ic, "GET CHAT %s ADDER\n", id);
-                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
         } else if (!strcmp(info, "STATUS UNSUBSCRIBED")) {
                 gc = bee_chat_by_title(ic->bee, ic, id);
@@ -1257 +1264 @@
                 }
                 g_strfreev(lines);
-        } else if (st == 0 || (st < 0 && !sockerr_again())) {
+        } else if (st == 0 || (st < 0 && !ssl_sockerr_again(sd->ssl))) {
                 ssl_disconnect(sd->ssl);
                 sd->fd = -1;