more fixes
This commit is contained in:
parent
d98ee81520
commit
c092189373
|
@ -26,6 +26,10 @@ import sys
|
||||||
import gtk
|
import gtk
|
||||||
import gobject
|
import gobject
|
||||||
|
|
||||||
|
import signal
|
||||||
|
|
||||||
|
signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
|
||||||
|
|
||||||
def send_error(error_message):
|
def send_error(error_message):
|
||||||
sys.stderr.write(error_message + '\n')
|
sys.stderr.write(error_message + '\n')
|
||||||
sys.stderr.flush()
|
sys.stderr.flush()
|
||||||
|
@ -41,7 +45,7 @@ _version = getattr(dbus, 'version', (0, 20, 0))
|
||||||
OBJ_PATH = '/org/gajim/dbus/RemoteObject'
|
OBJ_PATH = '/org/gajim/dbus/RemoteObject'
|
||||||
INTERFACE = 'org.gajim.dbus.RemoteInterface'
|
INTERFACE = 'org.gajim.dbus.RemoteInterface'
|
||||||
SERVICE = 'org.gajim.dbus'
|
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',
|
'list_accounts', 'change_status', 'new_message', 'send_message',
|
||||||
'contact_info']
|
'contact_info']
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ class SignalObject(DbusPrototype):
|
||||||
else:
|
else:
|
||||||
DbusPrototype.__init__(self, OBJ_PATH, service,
|
DbusPrototype.__init__(self, OBJ_PATH, service,
|
||||||
[ self.show_roster,
|
[ self.show_roster,
|
||||||
self.show_waiting,
|
self.show_next_unread,
|
||||||
self.list_contacts,
|
self.list_contacts,
|
||||||
self.list_accounts,
|
self.list_accounts,
|
||||||
self.change_status,
|
self.change_status,
|
||||||
|
@ -176,8 +176,9 @@ class SignalObject(DbusPrototype):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def show_next_unread(self, *args):
|
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: 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:
|
if len(self.plugin.systray.jids) != 0:
|
||||||
account = self.plugin.systray.jids[0][0]
|
account = self.plugin.systray.jids[0][0]
|
||||||
jid = self.plugin.systray.jids[0][1]
|
jid = self.plugin.systray.jids[0][1]
|
||||||
|
@ -341,7 +342,7 @@ class SignalObject(DbusPrototype):
|
||||||
show_roster = method(INTERFACE)(show_roster)
|
show_roster = method(INTERFACE)(show_roster)
|
||||||
list_contacts = method(INTERFACE)(list_contacts)
|
list_contacts = method(INTERFACE)(list_contacts)
|
||||||
list_accounts = method(INTERFACE)(list_accounts)
|
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)
|
change_status = method(INTERFACE)(change_status)
|
||||||
new_message = method(INTERFACE)(new_message)
|
new_message = method(INTERFACE)(new_message)
|
||||||
contact_info = method(INTERFACE)(contact_info)
|
contact_info = method(INTERFACE)(contact_info)
|
||||||
|
|
Loading…
Reference in New Issue