Changeset 9b2a8c1


Ignore:
Timestamp:
2013-03-17T13:03:25Z (8 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:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/README

    red3ff43 r9b2a8c1  
    3131== Requirements
    3232
    33 * Skype >= 1.4.0.99. The latest version I've tested is 2.2.0.35.
     33* Skype >= 1.4.0.99. The latest version I've tested is 4.1.0.20.
    3434* BitlBee >= 3.0. The latest version I've tested is @BITLBEE_VERSION@. Use
    3535  old versions (see the NEWS file about which one) if you have older BitlBee
  • protocols/skype/skype.c

    red3ff43 r9b2a8c1  
    10151015                        sd->adder = NULL;
    10161016                }
    1017         } else if (!strncmp(info, "MEMBERS ", 8)) {
     1017        } else if (!strncmp(info, "MEMBERS ", 8) || !strncmp(info, "ACTIVEMEMBERS ", 14) ) {
    10181018                info += 8;
    10191019                gc = bee_chat_by_title(ic->bee, ic, id);
     
    12201220
    12211221        /* Auto join to bookmarked chats if requested.*/
    1222         if (set_getbool(&ic->acc->set, "auto_join"))
     1222        if (set_getbool(&ic->acc->set, "auto_join")) {
    12231223                skype_printf(ic, "SEARCH BOOKMARKEDCHATS\n");
     1224                skype_printf(ic, "SEARCH ACTIVECHATS\n");
     1225                skype_printf(ic, "SEARCH MISSEDCHATS\n");
     1226                skype_printf(ic, "SEARCH RECENTCHATS\n");
     1227        }
    12241228        return st;
    12251229}
  • protocols/skype/skyped.py

    red3ff43 r9b2a8c1  
    129129                if not options.conn: return
    130130                try:
    131                         sock.sendall(txt)
     131                        done = sock.sendall(txt)
    132132                except socket.error as s:
    133133                        dprint("Warning, sending '%s' failed (%s)." % (txt, s))
     
    139139                        if wait_for_lock(options.lock, 3, 10, "socket send"):
    140140                                try:
    141                                          if options.conn: sock.sendall(txt)
     141                                         if options.conn: done = sock.sendall(txt)
    142142                                         options.lock.release()
    143143                                except socket.error as s:
     
    254254        global options
    255255
    256         now = strftime("%Y-%m-%d %H:%M:%S")
    257 
    258256        if options.debug:
     257                import inspect
     258                prefix = strftime("[%Y-%m-%d %H:%M:%S]") + " %s:%d" % inspect.stack()[1][1:3]
    259259                sanitized = msg
    260260
    261261                try:
    262                         print now + ": " + msg
     262                        print prefix + ": " + msg
    263263                except Exception, s:
    264264                        try:
     
    269269                                except Error, s:
    270270                                        sanitized = "[unable to print debug message]"
    271                         print now + "~=" + sanitized
     271                        print prefix + "~=" + sanitized
    272272
    273273                if options.log:
    274274                        sock = open(options.log, "a")
    275                         sock.write("%s skyped: %s\n" % (now, sanitized))
     275                        sock.write(prefix + ": " + sanitized)
    276276                        sock.close()
    277277
     
    468468
    469469        if not os.path.exists(options.config):
    470                 parser.error(( "Can't find configuration file at '%s'."
     470                parser.error(( "Can't find configuration file at '%s'. "
    471471                        "Use the -c option to specify an alternate one." )% options.config)
    472472
  • protocols/skype/test.py

    red3ff43 r9b2a8c1  
    110110                self.mock("groupchat-invite")
    111111
     112        def testGroupchatLeave(self):
     113                self.mock("groupchat-leave")
     114       
    112115        def testCalledYes(self):
    113116                self.mock("called-yes")
Note: See TracChangeset for help on using the changeset viewer.