diff -rN -u old-cohoba/cohoba/houston/Account.py new-cohoba/cohoba/houston/Account.py --- old-cohoba/cohoba/houston/Account.py 2006-08-11 16:07:43.000000000 +0200 +++ new-cohoba/cohoba/houston/Account.py 2006-08-11 16:07:43.000000000 +0200 @@ -91,7 +91,9 @@ def set_presence(self, name, message): presence_iface = get_proxy_provider().get_iface(self.conn_obj, 'org.freedesktop.Telepathy.Connection.Interface.Presence') - presence_iface.SetStatus({name: {"message": message}}, reply_handler=lambda: None, error_handler=global_error_handler) + import dbus + d = dbus.Dictionary({"message": message}, signature = "sv") + presence_iface.SetStatus({name: d}, reply_handler=lambda: None, error_handler=global_error_handler) def account_changed(self, setting_change=False, save=True): if save: diff -rN -u old-cohoba/cohoba/cohoba-applet.py new-cohoba/cohoba/cohoba-applet.py --- old-cohoba/cohoba/cohoba-applet.py 2006-08-11 16:07:43.000000000 +0200 +++ new-cohoba/cohoba/cohoba-applet.py 2006-08-11 16:07:43.000000000 +0200 @@ -42,10 +42,12 @@ gettext.bind_textdomain_codeset('cohoba','UTF-8') gettext.textdomain('cohoba') -locale.bindtextdomain('cohoba', abspath(join(cohoba.defs.DATA_DIR, "locale"))) +if hasattr(locale, 'bind_textdomain'): + locale.bindtextdomain('cohoba', abspath(join(cohoba.defs.DATA_DIR, "locale"))) if hasattr(locale, 'bind_textdomain_codeset'): locale.bind_textdomain_codeset('cohoba','UTF-8') -locale.textdomain('cohoba') +if hasattr(locale, 'textdomain'): + locale.textdomain('cohoba') diff -rN -u old-cohoba/cohoba/technobabble/TelepathyConversation.py new-cohoba/cohoba/technobabble/TelepathyConversation.py --- old-cohoba/cohoba/technobabble/TelepathyConversation.py 2006-08-11 16:09:08.000000000 +0200 +++ new-cohoba/cohoba/technobabble/TelepathyConversation.py 2006-08-11 16:09:09.000000000 +0200 @@ -50,7 +50,7 @@ #--------------------- def send_message(self, message, message_type=CHANNEL_TEXT_MESSAGE_TYPE_NORMAL): - self.textchannel_iface["text"].Send(message_type, message, reply_handler=lambda: None, error_handler=global_error_handler) + self.textchannel_iface["text"].Send(dbus.UInt32(message_type) ,message, reply_handler=lambda: None, error_handler=global_error_handler) def close(self): self.textchannel_iface["chan"].Close(reply_callback=lambda: None, error_callback=global_error_handler)