From e9a6b7c108d66c3d648c6e2bce16a030e6c096d5 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos <kourem@gmail.com> Date: Sun, 24 Sep 2006 19:22:10 +0000 Subject: [PATCH] kill old dbus --- src/remote_control.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/remote_control.py b/src/remote_control.py index 05156cf84d..08bfb62bd4 100644 --- a/src/remote_control.py +++ b/src/remote_control.py @@ -36,14 +36,9 @@ from dialogs import AddNewContactWindow, NewChatDialog import dbus_support if dbus_support.supported: import dbus - if dbus_support.version >= (0, 41, 0): + if dbus_support: import dbus.service - 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 + import dbus.glib # cause dbus 0.35+ doesn't return signal replies without it INTERFACE = 'org.gajim.dbus.RemoteInterface' OBJ_PATH = '/org/gajim/dbus/RemoteObject' @@ -133,7 +128,7 @@ class Remote: def raise_signal(self, signal, arg): if self.signal_object: self.signal_object.raise_signal(signal, - get_dbus_struct(arg)) + get_dbus_struct(arg)) class SignalObject(DbusPrototype): @@ -159,7 +154,7 @@ class SignalObject(DbusPrototype): self.change_status, self.open_chat, self.send_message, - self.send_single_message, + self.send_single_message, self.contact_info, self.send_file, self.prefs_list, -- GitLab