Changeset f539d6e

Timestamp:

2013-05-01T18:55:50Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

af496d8

Parents:

dd95ce4 (diff), c2a863d (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) (2 diffs)
• skype.c (modified) (3 diffs)
• skyped.py (modified) (1 diff)
• t/away-set-bitlbee.mock (added)
• t/away-set-skyped.mock (added)
• t/group-add-bitlbee.mock (added)
• t/group-add-skyped.mock (added)
• t/groupchat-msg-bitlbee.mock (added)
• t/groupchat-msg-skyped.mock (added)
• t/groupchat-topic-bitlbee.mock (added)
• t/groupchat-topic-skyped.mock (added)
• test.py (modified) (3 diffs)

protocols/skype/README

@@ -58 +58 @@
 connects to Skype, finally BitlBee can connect to `skyped`.
 
-=== Installing under Frugalware or Debian
-
-- Install the necessary packages:
-
-----
-# pacman-g2 -S bitlbee-skype
-----
-
-or
+=== Installing
+
+Either use your package manager to install the Skype plugin, using something
+like:
 
 ----
@@ -72 +67 @@
 ----
 
-(the later from the unstable repo)
-
-and you don't have to compile anything manually.
-
-=== Installing under OS X
-
-- Install the necessary packages from ports:
-
-NOTE: You have to edit the Portfile manually to include the install-dev target,
-just append install-dev after install-etc.
-
-----
-# port -v install bitlbee
-----
-
-and you have to install `bitlbee-skype` and `skype4py` from
-source.
-
-=== Installing from source
-
-NOTE: bitlbee-skype by default builds and installs skyped and the
-plugin. In case you just want to install the plugin for a public server
-or you want to use skyped with a public server (like
-`bitlbee1.asnetinc.net`), you don't need both.
-
-- You need the latest stable BitlBee release (unless you want to use a
-  public server):
-
-----
-$ wget http://get.bitlbee.org/src/bitlbee-@BITLBEE_VERSION@.tar.gz
-$ tar xf bitlbee-@BITLBEE_VERSION@.tar.gz
-$ cd bitlbee-@BITLBEE_VERSION@
-----
-
-- Now compile and install it:
-
-----
-$ ./configure
-$ make
-# make install install-dev
-----
-
-- To install http://skype4py.sourceforge.net/[Skype4Py] from source
-  (unless you want to install the plugin for a public server):
-
-----
-$ tar -zxvf Skype4Py-x.x.x.x.tar.gz
-$ cd Skype4Py-x.x.x.x
-# python setup.py install
-----
-
-- Get the plugin code (in an empty dir, or whereever you want, it does
-  not matter):
-
-----
-$ wget http://vmiklos.hu/project/bitlbee-skype/bitlbee-skype-@VERSION@.tar.gz
-$ tar xf bitlbee-skype-@VERSION@.tar.gz
-$ cd bitlbee-skype-@VERSION@
-----
-
-- Compile and install it:
-
-----
-$ ./configure
-$ make
-# make install
-----
-
-This will install the plugin to where BitlBee expects them, which is
-`/usr/local/lib/bitlbee` if you installed BitlBee from source.
+Or install http://sourceforge.net/projects/skype4py/[Skype4Py], and build
+BitlBee with `--skype=1`.
 
 === Configuring

protocols/skype/skype.c

@@ -344 +344 @@
         ptr++;
         if (!strncmp(ptr, "ONLINESTATUS ", 13)) {
-                        if (!strcmp(user, sd->username))
-                                return;
-                        if (!set_getbool(&ic->acc->set, "test_join")
+                if (!strlen(user) || !strcmp(user, sd->username))
+                        return;
+                if (!set_getbool(&ic->acc->set, "test_join")
                                 && !strcmp(user, "echo123"))
-                                return;
+                        return;
                 ptr = g_strdup_printf("%s@skype.com", user);
                 imcb_add_buddy(ic, ptr, skype_group_by_username(ic, user));
@@ -1016 +1016 @@
                 }
         } else if (!strncmp(info, "MEMBERS ", 8) || !strncmp(info, "ACTIVEMEMBERS ", 14) ) {
-                info += 8;
+                if (!strncmp(info, "MEMBERS ", 8))
+                        info += 8;
+                else
+                        info += 14;
                 gc = bee_chat_by_title(ic->bee, ic, id);
                 /* Hack! We set ->data to TRUE
@@ -1564 +1567 @@
 
         s = set_add(&acc->set, "mood_text", NULL, skype_set_mood_text, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "call", NULL, skype_set_call, acc);

protocols/skype/skyped.py

@@ -273 +273 @@
                 if options.log:
                         sock = open(options.log, "a")
-                        sock.write(prefix + ": " + sanitized)
+                        sock.write("%s: %s\n" % (prefix, sanitized))
                         sock.close()
 

protocols/skype/test.py

@@ -113 +113 @@
                 self.mock("groupchat-leave")
         
+        def testGroupchatMsg(self):
+                self.mock("groupchat-msg")
+        
+        def testGroupchatTopic(self):
+                self.mock("groupchat-topic")
+        
         def testCalledYes(self):
                 self.mock("called-yes")
@@ -125 +131 @@
                 self.mock("group-read")
 
+        def testGroupAdd(self):
+                self.mock("group-add")
+
         def testCtcpHelp(self):
                 self.mock("ctcp-help")
@@ -130 +139 @@
         def testSetMoodText(self):
                 self.mock("set-mood-text")
+        
+        def testAwaySet(self):
+                self.mock("away-set")
 
 if __name__ == '__main__':