Changeset 12bfb27


Ignore:
Timestamp:
2008-11-07T13:34:51Z (12 years ago)
Author:
Miklos Vajna <vmiklos@…>
Branches:
master
Children:
7199b74
Parents:
cc5f8ac (diff), c49820d (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 branch 'master' of vmiklos@…:/home/vmiklos/ftp/vmiklos.hu/htdocs/project/bitlbee-skype

Location:
skype
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • skype/Makefile

    rcc5f8ac r12bfb27  
    11-include config.mak
    22
    3 VERSION = 0.6.2
    4 # oldest supported one
    5 BITLBEE_VERSION = 1.2.2
     3VERSION = 0.6.3
     4# latest stable
     5BITLBEE_VERSION = 1.2.3
    66
    77AMVERSION = $(shell automake --version|sed 's/.* //;s/\([0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/;q')
  • skype/NEWS

    rcc5f8ac r12bfb27  
    11VERSION         DESCRIPTION
    22-----------------------------------------------------------------------------
     30.6.3         - various osx-specific improvements (see the new screenshot!)
     4              - added python-gnutls install instructions
     5              - bitlbee.pc is now searched under
     6                /usr/local/lib/pkgconfig by default to help LFS monkeys ;)
    370.6.2         - bugfix: make install required the plugin even in case
    48                its build was disabled
  • skype/README

    rcc5f8ac r12bfb27  
    354354  `join_chat` to a public chat..
    355355
     356- Add yasrd (Yet Another Skype-Related Daemon) to allow using a public
     357  server for users who are behind NAT.
     358
    356359== I would like to have support for ...
    357360
  • skype/skyped.py

    rcc5f8ac r12bfb27  
    178178                if not len(msg_text) or msg_text == "PONG":
    179179                        return
    180                 e = msg_text.decode(locale.getdefaultlocale()[1])
     180                try:
     181                        e = msg_text.decode(locale.getdefaultlocale()[1])
     182                except ValueError:
     183                        e = msg_text.decode('UTF-8')
    181184                dprint('>> ' + e)
    182185                try:
Note: See TracChangeset for help on using the changeset viewer.