From c09218937397a9f38e5f42ed775e5f1dca695ea4 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Sun, 17 Jul 2005 22:38:38 +0000 Subject: [PATCH] more fixes --- scripts/gajim-remote.py | 6 +++++- src/remote_control.py | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/gajim-remote.py b/scripts/gajim-remote.py index 2b8a3da08..22bc4e405 100755 --- a/scripts/gajim-remote.py +++ b/scripts/gajim-remote.py @@ -26,6 +26,10 @@ import sys import gtk import gobject +import signal + +signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application + def send_error(error_message): sys.stderr.write(error_message + '\n') sys.stderr.flush() @@ -41,7 +45,7 @@ _version = getattr(dbus, 'version', (0, 20, 0)) OBJ_PATH = '/org/gajim/dbus/RemoteObject' INTERFACE = 'org.gajim.dbus.RemoteInterface' SERVICE = 'org.gajim.dbus' -commands = ['help', 'show_roster', 'show_waiting', 'list_contacts', +commands = ['help', 'show_roster', 'show_next_unread', 'list_contacts', 'list_accounts', 'change_status', 'new_message', 'send_message', 'contact_info'] diff --git a/src/remote_control.py b/src/remote_control.py index a1f9aeb0d..21ab93ea9 100644 --- a/src/remote_control.py +++ b/src/remote_control.py @@ -84,7 +84,7 @@ class SignalObject(DbusPrototype): else: DbusPrototype.__init__(self, OBJ_PATH, service, [ self.show_roster, - self.show_waiting, + self.show_next_unread, self.list_contacts, self.list_accounts, self.change_status, @@ -176,8 +176,9 @@ class SignalObject(DbusPrototype): return None def show_next_unread(self, *args): - ''' Show the window(s) with next waiting messages/chats. ''' + ''' Show the window(s) with next waiting messages in tabbed/group chats. ''' #FIXME: when systray is disabled this method does nothing. + #FIXME: show message from GC that refer to us (like systray does) if len(self.plugin.systray.jids) != 0: account = self.plugin.systray.jids[0][0] jid = self.plugin.systray.jids[0][1] @@ -341,7 +342,7 @@ class SignalObject(DbusPrototype): show_roster = method(INTERFACE)(show_roster) list_contacts = method(INTERFACE)(list_contacts) list_accounts = method(INTERFACE)(list_accounts) - show_waiting = method(INTERFACE)(show_waiting) + show_waiting = method(INTERFACE)(show_next_unread) change_status = method(INTERFACE)(change_status) new_message = method(INTERFACE)(new_message) contact_info = method(INTERFACE)(contact_info)