Mercurial > libervia-backend
diff src/bridge/DBus.py @ 387:e66d300c5d42
frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Thu, 29 Sep 2011 12:13:22 +0200 |
| parents | 3ea41a199b36 |
| children | 3ed53803b3b3 |
line wrap: on
line diff
--- a/src/bridge/DBus.py Thu Sep 29 12:09:31 2011 +0200 +++ b/src/bridge/DBus.py Thu Sep 29 12:13:22 2011 +0200 @@ -78,7 +78,7 @@ @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, signature='ss') - def contactDeleted(self, entity, profile): + def contactDeleted(self, entity_jid, profile): pass @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, @@ -93,7 +93,7 @@ @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, signature='sa{ss}ass') - def newContact(self, contact, attributes, groups, profile): + def newContact(self, contact_jid, attributes, groups, profile): pass @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, @@ -108,12 +108,12 @@ @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, signature='ssia{ss}s') - def presenceUpdate(self, entity, show, priority, statuses, profile): + def presenceUpdate(self, entity_jid, show, priority, statuses, profile): pass @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, signature='sss') - def subscribe(self, sub_type, entity, profile): + def subscribe(self, sub_type, entity_jid, profile): pass @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, @@ -127,8 +127,8 @@ @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, in_signature='ss', out_signature='', async_callbacks=None) - def addContact(self, entity, profile_key="@DEFAULT@"): - return self.cb["addContact"](unicode(entity), unicode(profile_key)) + def addContact(self, entity_jid, profile_key="@DEFAULT@"): + return self.cb["addContact"](unicode(entity_jid), unicode(profile_key)) @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, in_signature='s', out_signature='', @@ -163,8 +163,8 @@ @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, in_signature='ss', out_signature='', async_callbacks=None) - def delContact(self, entity, profile_key="@DEFAULT@"): - return self.cb["delContact"](unicode(entity), unicode(profile_key)) + def delContact(self, entity_jid, profile_key="@DEFAULT@"): + return self.cb["delContact"](unicode(entity_jid), unicode(profile_key)) @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, in_signature='s', out_signature='i', @@ -319,8 +319,8 @@ @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, in_signature='ssass', out_signature='', async_callbacks=None) - def updateContact(self, entity, name, groups, profile_key="@DEFAULT@"): - return self.cb["updateContact"](unicode(entity), unicode(name), groups, unicode(profile_key)) + def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@"): + return self.cb["updateContact"](unicode(entity_jid), unicode(name), groups, unicode(profile_key)) def __attributes(self, in_sign): @@ -417,8 +417,8 @@ def connectionError(self, error_type, profile): self.dbus_bridge.connectionError(error_type, profile) - def contactDeleted(self, entity, profile): - self.dbus_bridge.contactDeleted(entity, profile) + def contactDeleted(self, entity_jid, profile): + self.dbus_bridge.contactDeleted(entity_jid, profile) def disconnected(self, profile): self.dbus_bridge.disconnected(profile) @@ -426,8 +426,8 @@ def newAlert(self, message, title, alert_type, profile): self.dbus_bridge.newAlert(message, title, alert_type, profile) - def newContact(self, contact, attributes, groups, profile): - self.dbus_bridge.newContact(contact, attributes, groups, profile) + def newContact(self, contact_jid, attributes, groups, profile): + self.dbus_bridge.newContact(contact_jid, attributes, groups, profile) def newMessage(self, from_jid, message, mess_type, to_jid, profile): self.dbus_bridge.newMessage(from_jid, message, mess_type, to_jid, profile) @@ -435,11 +435,11 @@ def paramUpdate(self, name, value, category, profile): self.dbus_bridge.paramUpdate(name, value, category, profile) - def presenceUpdate(self, entity, show, priority, statuses, profile): - self.dbus_bridge.presenceUpdate(entity, show, priority, statuses, profile) + def presenceUpdate(self, entity_jid, show, priority, statuses, profile): + self.dbus_bridge.presenceUpdate(entity_jid, show, priority, statuses, profile) - def subscribe(self, sub_type, entity, profile): - self.dbus_bridge.subscribe(sub_type, entity, profile) + def subscribe(self, sub_type, entity_jid, profile): + self.dbus_bridge.subscribe(sub_type, entity_jid, profile) def updatedValue(self, name, value, profile): self.dbus_bridge.updatedValue(name, value, profile)