Mercurial > libervia-backend

diff frontends/src/bridge/DBus.py @ 1265:e3a9ea76de35 frontends_multi_profiles

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
quick_frontend, primitivus: multi-profiles refactoring part 1 (big commit, sorry :p): This refactoring allow primitivus to manage correctly several profiles at once, with various other improvments: - profile_manager can now plug several profiles at once, requesting password when needed. No more profile plug specific method is used anymore in backend, instead a "validated" key is used in actions - Primitivus widget are now based on a common "PrimitivusWidget" classe which mainly manage the decoration so far - all widgets are treated in the same way (contactList, Chat, Progress, etc), no more chat_wins specific behaviour - widgets are created in a dedicated manager, with facilities to react on new widget creation or other events - quick_frontend introduce a new QuickWidget class, which aims to be as generic and flexible as possible. It can manage several targets (jids or something else), and several profiles - each widget class return a Hash according to its target. For example if given a target jid and a profile, a widget class return a hash like (target.bare, profile), the same widget will be used for all resources of the same jid - better management of CHAT_GROUP mode for Chat widgets - some code moved from Primitivus to QuickFrontend, the final goal is to have most non backend code in QuickFrontend, and just graphic code in subclasses - no more (un)escapePrivate/PRIVATE_PREFIX - contactList improved a lot: entities not in roster and special entities (private MUC conversations) are better managed - resources can be displayed in Primitivus, and their status messages - profiles are managed in QuickFrontend with dedicated managers This is work in progress, other frontends are broken. Urwid SàText need to be updated. Most of features of Primitivus should work as before (or in a better way ;))
author Goffi <goffi@goffi.org>
date Wed, 10 Dec 2014 19:00:09 +0100
parents c1e916594e09
children faa1129559b8
line wrap: on
line diff
--- a/frontends/src/bridge/DBus.py	Wed Dec 10 18:37:14 2014 +0100
+++ b/frontends/src/bridge/DBus.py	Wed Dec 10 19:00:09 2014 +0100
@@ -144,8 +144,9 @@
     def confirmationAnswer(self, id, accepted, data, profile):
         return self.db_core_iface.confirmationAnswer(id, accepted, data, profile)
 
-    def delContact(self, entity_jid, profile_key="@DEFAULT@"):
-        return self.db_core_iface.delContact(entity_jid, profile_key)
+    def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None):
+        error_handler = None if callback is None else lambda err:errback(dbus_to_bridge_exception(err))
+        return self.db_core_iface.delContact(entity_jid, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)
 
     def discoInfos(self, entity_jid, profile_key, callback=None, errback=None):
         error_handler = None if callback is None else lambda err:errback(dbus_to_bridge_exception(err))
@@ -161,8 +162,9 @@
     def getConfig(self, section, name):
         return unicode(self.db_core_iface.getConfig(section, name))
 
-    def getContacts(self, profile_key="@DEFAULT@"):
-        return self.db_core_iface.getContacts(profile_key)
+    def getContacts(self, profile_key="@DEFAULT@", callback=None, errback=None):
+        error_handler = None if callback is None else lambda err:errback(dbus_to_bridge_exception(err))
+        return self.db_core_iface.getContacts(profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)
 
     def getContactsFromGroup(self, group, profile_key="@DEFAULT@"):
         return self.db_core_iface.getContactsFromGroup(group, profile_key)
@@ -255,5 +257,6 @@
     def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
         return self.db_core_iface.subscription(sub_type, entity, profile_key)
 
-    def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@"):
-        return self.db_core_iface.updateContact(entity_jid, name, groups, profile_key)
+    def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None):
+        error_handler = None if callback is None else lambda err:errback(dbus_to_bridge_exception(err))
+        return self.db_core_iface.updateContact(entity_jid, name, groups, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)