Changeset bf8ee39

Timestamp:

2011-06-16T21:59:06Z (13 years ago)

Author:

unknown <vmiklos@…>

Branches:

master

Children:

2ff0f37

Parents:

370899f (diff), 05d964c (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 IPv6 and groupchat fixes from hrubi.

Location:

protocols/skype

Files:

• skype.c (modified) (3 diffs)
• skyped.py (modified) (2 diffs)

protocols/skype/skype.c

@@ -912 +912 @@
                 imcb_chat_free(gc);
         if (!strcmp(info, "STATUS MULTI_SUBSCRIBED")) {
-                gc = imcb_chat_new(ic, id);
-                imcb_chat_name_hint(gc, id);
+                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);
@@ -1198 +1201 @@
         skype_printf(ic, "SET USERSTATUS OFFLINE\n");
 
+        while( ic->groupchats )
+                imcb_chat_free(ic->groupchats->data);
+
         for (i = 0; i < g_list_length(sd->groups); i++) {
                 struct skype_group *sg = (struct skype_group *)g_list_nth_data(sd->groups, i);
@@ -1392 +1398 @@
         char *ptr, *nick;
 
-        /* Unused parameter */
-        who = who;
-
-        nick = g_strdup(message);
+        nick = g_strdup(who);
         ptr = strchr(nick, '@');
         if (ptr)

protocols/skype/skyped.py

@@ -180 +180 @@
 def server(host, port, skype = None):
         global options
-        sock = socket.socket()
+        if ":" in host:
+                sock = socket.socket(socket.AF_INET6)
+        else:
+                sock = socket.socket()
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((host, port))
@@ -360 +363 @@
         -d      --debug         enable debug messages
         -h      --help          this help
-        -H      --host          set the tcp host (default: %s)
+        -H      --host          set the tcp host, supports IPv4 and IPv6 (default: %s)
         -l      --log           set the log file in background mode (default: none)
         -n      --nofork        don't run as daemon in the background