diff src/bridge/DBus.py @ 2050:046449cc2bff

core, bridge, frontends: removed deprecated bridge method askConfirmation, confirmationAnswer, actionResult, actionResultExt and getWaitingConf
author Goffi <goffi@goffi.org>
date Sun, 28 Aug 2016 19:23:58 +0200
parents b536dd121da1
children 7999d5299ddc
line wrap: on
line diff
--- a/src/bridge/DBus.py	Sun Aug 28 18:24:45 2016 +0200
+++ b/src/bridge/DBus.py	Sun Aug 28 19:23:58 2016 +0200
@@ -131,21 +131,6 @@
         pass
 
     @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
-                         signature='ssa{ss}s')
-    def actionResult(self, answer_type, id, data, profile):
-        pass
-
-    @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
-                         signature='ssa{sa{ss}}s')
-    def actionResultExt(self, answer_type, id, data, profile):
-        pass
-
-    @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
-                         signature='ssa{ss}s')
-    def askConfirmation(self, id, conf_type, data, profile):
-        pass
-
-    @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
                          signature='ss')
     def connected(self, profile, jid_s):
         pass
@@ -171,11 +156,6 @@
         pass
 
     @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
-                         signature='ssss')
-    def newAlert(self, message, title, alert_type, profile):
-        pass
-
-    @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
                          signature='sa{ss}ass')
     def newContact(self, contact_jid, attributes, groups, profile):
         pass
@@ -255,12 +235,6 @@
         return self._callback("asyncGetParamsValuesFromCategory", unicode(category), security_limit, unicode(profile_key), callback=callback, errback=errback)
 
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
-                         in_signature='sba{ss}s', out_signature='',
-                         async_callbacks=None)
-    def confirmationAnswer(self, id, accepted, data, profile):
-        return self._callback("confirmationAnswer", unicode(id), accepted, data, unicode(profile))
-
-    @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='ss', out_signature='',
                          async_callbacks=('callback', 'errback'))
     def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None):
@@ -387,12 +361,6 @@
         return self._callback("getVersion", )
 
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
-                         in_signature='s', out_signature='a(ssa{ss})',
-                         async_callbacks=None)
-    def getWaitingConf(self, profile_key):
-        return self._callback("getWaitingConf", unicode(profile_key))
-
-    @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='s', out_signature='a{ss}',
                          async_callbacks=None)
     def getWaitingSub(self, profile_key="@DEFAULT@"):
@@ -605,15 +573,6 @@
     def actionNew(self, action_data, id, security_limit, profile):
         self.dbus_bridge.actionNew(action_data, id, security_limit, profile)
 
-    def actionResult(self, answer_type, id, data, profile):
-        self.dbus_bridge.actionResult(answer_type, id, data, profile)
-
-    def actionResultExt(self, answer_type, id, data, profile):
-        self.dbus_bridge.actionResultExt(answer_type, id, data, profile)
-
-    def askConfirmation(self, id, conf_type, data, profile):
-        self.dbus_bridge.askConfirmation(id, conf_type, data, profile)
-
     def connected(self, profile, jid_s):
         self.dbus_bridge.connected(profile, jid_s)
 
@@ -629,9 +588,6 @@
     def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile):
         self.dbus_bridge.messageNew(uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile)
 
-    def newAlert(self, message, title, alert_type, profile):
-        self.dbus_bridge.newAlert(message, title, alert_type, profile)
-
     def newContact(self, contact_jid, attributes, groups, profile):
         self.dbus_bridge.newContact(contact_jid, attributes, groups, profile)