Changeset 12bfb27

Timestamp:

2008-11-07T13:34:51Z (15 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:

• Makefile (modified) (1 diff)
• NEWS (modified) (1 diff)
• README (modified) (1 diff)
• skyped.py (modified) (1 diff)

skype/Makefile

@@ -1 +1 @@
 -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')

skype/NEWS

@@ -1 +1 @@
 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

skype/README

@@ -354 +354 @@
   `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 ...
 

skype/skyped.py

@@ -178 +178 @@
                 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: