Mercurial > libervia-backend

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2049:b67aece4a667 2050:046449cc2bff
129 signature='a{ss}sis') 129 signature='a{ss}sis')
130 def actionNew(self, action_data, id, security_limit, profile): 130 def actionNew(self, action_data, id, security_limit, profile):
131 pass 131 pass
132 132
133 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, 133 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
134 signature='ssa{ss}s')
135 def actionResult(self, answer_type, id, data, profile):
136 pass
137
138 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
139 signature='ssa{sa{ss}}s')
140 def actionResultExt(self, answer_type, id, data, profile):
141 pass
142
143 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
144 signature='ssa{ss}s')
145 def askConfirmation(self, id, conf_type, data, profile):
146 pass
147
148 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
149 signature='ss') 134 signature='ss')
150 def connected(self, profile, jid_s): 135 def connected(self, profile, jid_s):
151 pass 136 pass
152 137
153 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, 138 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
169 signature='sdssa{ss}a{ss}sa{ss}s') 154 signature='sdssa{ss}a{ss}sa{ss}s')
170 def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile): 155 def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile):
171 pass 156 pass
172 157
173 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, 158 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
174 signature='ssss')
175 def newAlert(self, message, title, alert_type, profile):
176 pass
177
178 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
179 signature='sa{ss}ass') 159 signature='sa{ss}ass')
180 def newContact(self, contact_jid, attributes, groups, profile): 160 def newContact(self, contact_jid, attributes, groups, profile):
181 pass 161 pass
182 162
183 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, 163 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
253 async_callbacks=('callback', 'errback')) 233 async_callbacks=('callback', 'errback'))
254 def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): 234 def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None):
255 return self._callback("asyncGetParamsValuesFromCategory", unicode(category), security_limit, unicode(profile_key), callback=callback, errback=errback) 235 return self._callback("asyncGetParamsValuesFromCategory", unicode(category), security_limit, unicode(profile_key), callback=callback, errback=errback)
256 236
257 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, 237 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
258 in_signature='sba{ss}s', out_signature='',
259 async_callbacks=None)
260 def confirmationAnswer(self, id, accepted, data, profile):
261 return self._callback("confirmationAnswer", unicode(id), accepted, data, unicode(profile))
262
263 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
264 in_signature='ss', out_signature='', 238 in_signature='ss', out_signature='',
265 async_callbacks=('callback', 'errback')) 239 async_callbacks=('callback', 'errback'))
266 def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): 240 def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None):
267 return self._callback("delContact", unicode(entity_jid), unicode(profile_key), callback=callback, errback=errback) 241 return self._callback("delContact", unicode(entity_jid), unicode(profile_key), callback=callback, errback=errback)
268 242
383 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, 357 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
384 in_signature='', out_signature='s', 358 in_signature='', out_signature='s',
385 async_callbacks=None) 359 async_callbacks=None)
386 def getVersion(self, ): 360 def getVersion(self, ):
387 return self._callback("getVersion", ) 361 return self._callback("getVersion", )
388
389 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
390 in_signature='s', out_signature='a(ssa{ss})',
391 async_callbacks=None)
392 def getWaitingConf(self, profile_key):
393 return self._callback("getWaitingConf", unicode(profile_key))
394 362
395 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, 363 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
396 in_signature='s', out_signature='a{ss}', 364 in_signature='s', out_signature='a{ss}',
397 async_callbacks=None) 365 async_callbacks=None)
398 def getWaitingSub(self, profile_key="@DEFAULT@"): 366 def getWaitingSub(self, profile_key="@DEFAULT@"):
603 self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH) 571 self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH)
604 572
605 def actionNew(self, action_data, id, security_limit, profile): 573 def actionNew(self, action_data, id, security_limit, profile):
606 self.dbus_bridge.actionNew(action_data, id, security_limit, profile) 574 self.dbus_bridge.actionNew(action_data, id, security_limit, profile)
607 575
608 def actionResult(self, answer_type, id, data, profile):
609 self.dbus_bridge.actionResult(answer_type, id, data, profile)
610
611 def actionResultExt(self, answer_type, id, data, profile):
612 self.dbus_bridge.actionResultExt(answer_type, id, data, profile)
613
614 def askConfirmation(self, id, conf_type, data, profile):
615 self.dbus_bridge.askConfirmation(id, conf_type, data, profile)
616
617 def connected(self, profile, jid_s): 576 def connected(self, profile, jid_s):
618 self.dbus_bridge.connected(profile, jid_s) 577 self.dbus_bridge.connected(profile, jid_s)
619 578
620 def contactDeleted(self, entity_jid, profile): 579 def contactDeleted(self, entity_jid, profile):
621 self.dbus_bridge.contactDeleted(entity_jid, profile) 580 self.dbus_bridge.contactDeleted(entity_jid, profile)
626 def entityDataUpdated(self, jid, name, value, profile): 585 def entityDataUpdated(self, jid, name, value, profile):
627 self.dbus_bridge.entityDataUpdated(jid, name, value, profile) 586 self.dbus_bridge.entityDataUpdated(jid, name, value, profile)
628 587
629 def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile): 588 def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile):
630 self.dbus_bridge.messageNew(uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile) 589 self.dbus_bridge.messageNew(uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile)
631
632 def newAlert(self, message, title, alert_type, profile):
633 self.dbus_bridge.newAlert(message, title, alert_type, profile)
634 590
635 def newContact(self, contact_jid, attributes, groups, profile): 591 def newContact(self, contact_jid, attributes, groups, profile):
636 self.dbus_bridge.newContact(contact_jid, attributes, groups, profile) 592 self.dbus_bridge.newContact(contact_jid, attributes, groups, profile)
637 593
638 def paramUpdate(self, name, value, category, profile): 594 def paramUpdate(self, name, value, category, profile):