Changeset 9b2a8c1

Timestamp:

2013-03-17T13:03:25Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0075527, e31e5b8

Parents:

ed3ff43 (diff), 215e171 (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 from vmiklos.

Location:

protocols/skype

Files:

• README (modified) (1 diff)
• skype.c (modified) (2 diffs)
• skyped.py (modified) (5 diffs)
• t/groupchat-leave-bitlbee.mock (added)
• t/groupchat-leave-skyped.mock (added)
• test.py (modified) (1 diff)

protocols/skype/README

@@ -31 +31 @@
 == Requirements
 
-* Skype >= 1.4.0.99. The latest version I've tested is 2.2.0.35.
+* Skype >= 1.4.0.99. The latest version I've tested is 4.1.0.20.
 * BitlBee >= 3.0. The latest version I've tested is @BITLBEE_VERSION@. Use
   old versions (see the NEWS file about which one) if you have older BitlBee

protocols/skype/skype.c

@@ -1015 +1015 @@
                         sd->adder = NULL;
                 }
-        } else if (!strncmp(info, "MEMBERS ", 8)) {
+        } else if (!strncmp(info, "MEMBERS ", 8) || !strncmp(info, "ACTIVEMEMBERS ", 14) ) {
                 info += 8;
                 gc = bee_chat_by_title(ic->bee, ic, id);
@@ -1220 +1220 @@
 
         /* Auto join to bookmarked chats if requested.*/
-        if (set_getbool(&ic->acc->set, "auto_join"))
+        if (set_getbool(&ic->acc->set, "auto_join")) {
                 skype_printf(ic, "SEARCH BOOKMARKEDCHATS\n");
+                skype_printf(ic, "SEARCH ACTIVECHATS\n");
+                skype_printf(ic, "SEARCH MISSEDCHATS\n");
+                skype_printf(ic, "SEARCH RECENTCHATS\n");
+        }
         return st;
 }

protocols/skype/skyped.py

@@ -129 +129 @@
                 if not options.conn: return
                 try:
-                        sock.sendall(txt)
+                        done = sock.sendall(txt)
                 except socket.error as s:
                         dprint("Warning, sending '%s' failed (%s)." % (txt, s))
@@ -139 +139 @@
                         if wait_for_lock(options.lock, 3, 10, "socket send"):
                                 try:
-                                         if options.conn: sock.sendall(txt)
+                                         if options.conn: done = sock.sendall(txt)
                                          options.lock.release()
                                 except socket.error as s:
@@ -254 +254 @@
         global options
 
-        now = strftime("%Y-%m-%d %H:%M:%S")
-
         if options.debug:
+                import inspect
+                prefix = strftime("[%Y-%m-%d %H:%M:%S]") + " %s:%d" % inspect.stack()[1][1:3]
                 sanitized = msg
 
                 try:
-                        print now + ": " + msg
+                        print prefix + ": " + msg
                 except Exception, s:
                         try:
@@ -269 +269 @@
                                 except Error, s:
                                         sanitized = "[unable to print debug message]"
-                        print now + "~=" + sanitized
+                        print prefix + "~=" + sanitized
 
                 if options.log:
                         sock = open(options.log, "a")
-                        sock.write("%s skyped: %s\n" % (now, sanitized))
+                        sock.write(prefix + ": " + sanitized)
                         sock.close()
 
@@ -468 +468 @@
 
         if not os.path.exists(options.config):
-                parser.error(( "Can't find configuration file at '%s'."
+                parser.error(( "Can't find configuration file at '%s'. "
                         "Use the -c option to specify an alternate one." )% options.config)
 

protocols/skype/test.py

@@ -110 +110 @@
                 self.mock("groupchat-invite")
 
+        def testGroupchatLeave(self):
+                self.mock("groupchat-leave")
+        
         def testCalledYes(self):
                 self.mock("called-yes")