diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-11-07 14:34:51 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2008-11-07 14:34:51 +0100 |
| commit | 12bfb2731a37d978fed1f971be7896c70b6a525c (patch) | |
| tree | 4f1c79ab18c76424ef83ecc19f5f4a119176cd11 | |
| parent | cc5f8acf5e88f9f207170172a22468847ff95f30 (diff) | |
| parent | c49820d52fc3e1f2b744a7b513fdf4cafa53bf29 (diff) | |
Merge branch 'master' of vmiklos@git.frugalware.org:/home/vmiklos/ftp/vmiklos.hu/htdocs/project/bitlbee-skype
| -rw-r--r-- | skype/Makefile | 6 | ||||
| -rw-r--r-- | skype/NEWS | 4 | ||||
| -rw-r--r-- | skype/README | 3 | ||||
| -rw-r--r-- | skype/skyped.py | 5 |
4 files changed, 14 insertions, 4 deletions
diff --git a/skype/Makefile b/skype/Makefile index 61f8519c..d7b4b417 100644 --- a/skype/Makefile +++ b/skype/Makefile @@ -1,8 +1,8 @@ -include config.mak -VERSION = 0.6.2 -# oldest supported one -BITLBEE_VERSION = 1.2.2 +VERSION = 0.6.3 +# latest stable +BITLBEE_VERSION = 1.2.3 AMVERSION = $(shell automake --version|sed 's/.* //;s/\([0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/;q') @@ -1,5 +1,9 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.6.3 - various osx-specific improvements (see the new screenshot!) + - added python-gnutls install instructions + - bitlbee.pc is now searched under + /usr/local/lib/pkgconfig by default to help LFS monkeys ;) 0.6.2 - bugfix: make install required the plugin even in case its build was disabled 0.6.1 - added keepalive traffic to avoid disconnects in bitlbee diff --git a/skype/README b/skype/README index 1a46b2ef..65b2808a 100644 --- a/skype/README +++ b/skype/README @@ -353,6 +353,9 @@ $ skyped -n -d request], this is because it is still not possible (under Linux) to `join_chat` to a public chat.. +- Add yasrd (Yet Another Skype-Related Daemon) to allow using a public + server for users who are behind NAT. + == I would like to have support for ... If something does not work and it's not in the TODO section, then please diff --git a/skype/skyped.py b/skype/skyped.py index c2773a97..f61583f3 100644 --- a/skype/skyped.py +++ b/skype/skyped.py @@ -177,7 +177,10 @@ class SkypeApi: def send(self, msg_text): if not len(msg_text) or msg_text == "PONG": return - e = msg_text.decode(locale.getdefaultlocale()[1]) + try: + e = msg_text.decode(locale.getdefaultlocale()[1]) + except ValueError: + e = msg_text.decode('UTF-8') dprint('>> ' + e) try: c = self.skype.Command(e, Block=True) |