copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kill old dbus

This commit is contained in:
Nikos Kouremenos 2006-09-24 19:22:10 +00:00
parent 0b79e47c8a
commit e9a6b7c108
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/remote_control.py
View File

@ -36,14 +36,9 @@ from dialogs import AddNewContactWindow, NewChatDialog
import dbus_support import dbus_support
if dbus_support.supported: if dbus_support.supported:
import dbus import dbus
if dbus_support.version >= (0, 41, 0): if dbus_support:
import dbus.service import dbus.service
import dbus.glib # cause dbus 0.35+ doesn't return signal replies without it import dbus.glib # cause dbus 0.35+ doesn't return signal replies without it
DbusPrototype = dbus.service.Object
elif dbus_support.version >= (0, 20, 0):
DbusPrototype = dbus.Object
else: #dbus is not defined
DbusPrototype = str
INTERFACE = 'org.gajim.dbus.RemoteInterface' INTERFACE = 'org.gajim.dbus.RemoteInterface'
OBJ_PATH = '/org/gajim/dbus/RemoteObject' OBJ_PATH = '/org/gajim/dbus/RemoteObject'
@ -133,7 +128,7 @@ class Remote:
def raise_signal(self, signal, arg): def raise_signal(self, signal, arg):
if self.signal_object: if self.signal_object:
self.signal_object.raise_signal(signal, self.signal_object.raise_signal(signal,
get_dbus_struct(arg)) get_dbus_struct(arg))
class SignalObject(DbusPrototype): class SignalObject(DbusPrototype):
@ -159,7 +154,7 @@ class SignalObject(DbusPrototype):
self.change_status, self.change_status,
self.open_chat, self.open_chat,
self.send_message, self.send_message,
self.send_single_message, self.send_single_message,
self.contact_info, self.contact_info,
self.send_file, self.send_file,
self.prefs_list, self.prefs_list,