Changeset f539d6e


Ignore:
Timestamp:
2013-05-01T18:55:50Z (7 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:
8 added
4 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/README

    rdd95ce4 rf539d6e  
    5858connects to Skype, finally BitlBee can connect to `skyped`.
    5959
    60 === Installing under Frugalware or Debian
    61 
    62 - Install the necessary packages:
    63 
    64 ----
    65 # pacman-g2 -S bitlbee-skype
    66 ----
    67 
    68 or
     60=== Installing
     61
     62Either use your package manager to install the Skype plugin, using something
     63like:
    6964
    7065----
     
    7267----
    7368
    74 (the later from the unstable repo)
    75 
    76 and you don't have to compile anything manually.
    77 
    78 === Installing under OS X
    79 
    80 - Install the necessary packages from ports:
    81 
    82 NOTE: You have to edit the Portfile manually to include the install-dev target,
    83 just append install-dev after install-etc.
    84 
    85 ----
    86 # port -v install bitlbee
    87 ----
    88 
    89 and you have to install `bitlbee-skype` and `skype4py` from
    90 source.
    91 
    92 === Installing from source
    93 
    94 NOTE: bitlbee-skype by default builds and installs skyped and the
    95 plugin. In case you just want to install the plugin for a public server
    96 or you want to use skyped with a public server (like
    97 `bitlbee1.asnetinc.net`), you don't need both.
    98 
    99 - You need the latest stable BitlBee release (unless you want to use a
    100   public server):
    101 
    102 ----
    103 $ wget http://get.bitlbee.org/src/bitlbee-@BITLBEE_VERSION@.tar.gz
    104 $ tar xf bitlbee-@BITLBEE_VERSION@.tar.gz
    105 $ cd bitlbee-@BITLBEE_VERSION@
    106 ----
    107 
    108 - Now compile and install it:
    109 
    110 ----
    111 $ ./configure
    112 $ make
    113 # make install install-dev
    114 ----
    115 
    116 - To install http://skype4py.sourceforge.net/[Skype4Py] from source
    117   (unless you want to install the plugin for a public server):
    118 
    119 ----
    120 $ tar -zxvf Skype4Py-x.x.x.x.tar.gz
    121 $ cd Skype4Py-x.x.x.x
    122 # python setup.py install
    123 ----
    124 
    125 - Get the plugin code (in an empty dir, or whereever you want, it does
    126   not matter):
    127 
    128 ----
    129 $ wget http://vmiklos.hu/project/bitlbee-skype/bitlbee-skype-@VERSION@.tar.gz
    130 $ tar xf bitlbee-skype-@VERSION@.tar.gz
    131 $ cd bitlbee-skype-@VERSION@
    132 ----
    133 
    134 - Compile and install it:
    135 
    136 ----
    137 $ ./configure
    138 $ make
    139 # make install
    140 ----
    141 
    142 This will install the plugin to where BitlBee expects them, which is
    143 `/usr/local/lib/bitlbee` if you installed BitlBee from source.
     69Or install http://sourceforge.net/projects/skype4py/[Skype4Py], and build
     70BitlBee with `--skype=1`.
    14471
    14572=== Configuring
  • protocols/skype/skype.c

    rdd95ce4 rf539d6e  
    344344        ptr++;
    345345        if (!strncmp(ptr, "ONLINESTATUS ", 13)) {
    346                         if (!strcmp(user, sd->username))
    347                                 return;
    348                         if (!set_getbool(&ic->acc->set, "test_join")
     346                if (!strlen(user) || !strcmp(user, sd->username))
     347                        return;
     348                if (!set_getbool(&ic->acc->set, "test_join")
    349349                                && !strcmp(user, "echo123"))
    350                                 return;
     350                        return;
    351351                ptr = g_strdup_printf("%s@skype.com", user);
    352352                imcb_add_buddy(ic, ptr, skype_group_by_username(ic, user));
     
    10161016                }
    10171017        } else if (!strncmp(info, "MEMBERS ", 8) || !strncmp(info, "ACTIVEMEMBERS ", 14) ) {
    1018                 info += 8;
     1018                if (!strncmp(info, "MEMBERS ", 8))
     1019                        info += 8;
     1020                else
     1021                        info += 14;
    10191022                gc = bee_chat_by_title(ic->bee, ic, id);
    10201023                /* Hack! We set ->data to TRUE
     
    15641567
    15651568        s = set_add(&acc->set, "mood_text", NULL, skype_set_mood_text, acc);
    1566         s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
     1569        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
    15671570
    15681571        s = set_add(&acc->set, "call", NULL, skype_set_call, acc);
  • protocols/skype/skyped.py

    rdd95ce4 rf539d6e  
    273273                if options.log:
    274274                        sock = open(options.log, "a")
    275                         sock.write(prefix + ": " + sanitized)
     275                        sock.write("%s: %s\n" % (prefix, sanitized))
    276276                        sock.close()
    277277
  • protocols/skype/test.py

    rdd95ce4 rf539d6e  
    113113                self.mock("groupchat-leave")
    114114       
     115        def testGroupchatMsg(self):
     116                self.mock("groupchat-msg")
     117       
     118        def testGroupchatTopic(self):
     119                self.mock("groupchat-topic")
     120       
    115121        def testCalledYes(self):
    116122                self.mock("called-yes")
     
    125131                self.mock("group-read")
    126132
     133        def testGroupAdd(self):
     134                self.mock("group-add")
     135
    127136        def testCtcpHelp(self):
    128137                self.mock("ctcp-help")
     
    130139        def testSetMoodText(self):
    131140                self.mock("set-mood-text")
     141       
     142        def testAwaySet(self):
     143                self.mock("away-set")
    132144
    133145if __name__ == '__main__':
Note: See TracChangeset for help on using the changeset viewer.