Mercurial > libervia-backend

changeset 1410:e2e75c3c7c7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
quick_frontend, primitivus: fixes a couple of issues: - chat: notification was raising an error when you just entered the room and self.nick is None - quick_widget: deleting a widget was modifying a dict while looping on it + unselect widget when it's being deleted
author souliane <souliane@mailoo.org>
date Thu, 16 Apr 2015 17:17:28 +0200
parents 3265a2639182
children 8767c0bb7d48
files INSTALL frontends/src/primitivus/chat.py frontends/src/quick_frontend/quick_contact_list.py frontends/src/quick_frontend/quick_widgets.py
diffstat 4 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL	Thu Apr 16 14:57:57 2015 +0200
+++ b/INSTALL	Thu Apr 16 17:17:28 2015 +0200
@@ -41,6 +41,7 @@
 ### end sat.conf ###
 
 Of course, replace ~/sat/media/destination/path with the actual path you want to use.
+Check the wiki for more information about this configuration file: http://wiki.goffi.org/wiki/Configuration/en
 
 You should now be able to launch sat:
 	- to launch the backend, enter
--- a/frontends/src/primitivus/chat.py	Thu Apr 16 14:57:57 2015 +0200
+++ b/frontends/src/primitivus/chat.py	Thu Apr 16 17:17:28 2015 +0200
@@ -365,7 +365,7 @@
         if not self.host.x_notify.hasFocus():
             if self.type == C.CHAT_ONE2ONE:
                 self.host.x_notify.sendNotification(_("Primitivus: %s is talking to you") % from_jid)
-            elif self.nick.lower() in msg.lower():
+            elif self.nick is not None and self.nick.lower() in msg.lower():
                 self.host.x_notify.sendNotification(_("Primitivus: %(user)s mentioned you in room '%(room)s'") % {'user': from_jid, 'room': self.target})
 
     # MENU EVENTS #
--- a/frontends/src/quick_frontend/quick_contact_list.py	Thu Apr 16 14:57:57 2015 +0200
+++ b/frontends/src/quick_frontend/quick_contact_list.py	Thu Apr 16 17:17:28 2015 +0200
@@ -249,6 +249,9 @@
         self._cache.clear()
         self._groups.clear()
         self._specials.clear()
+        self._special_extras.clear()
+        self._roster.clear()
+        self._alerts.clear()
         self.update()
 
     def setContact(self, entity, groups=None, attributes=None, in_roster=False):
--- a/frontends/src/quick_frontend/quick_widgets.py	Thu Apr 16 14:57:57 2015 +0200
+++ b/frontends/src/quick_frontend/quick_widgets.py	Thu Apr 16 17:17:28 2015 +0200
@@ -232,9 +232,12 @@
         widget_to_delete.onDelete()
 
         for widget_map in self._widgets.itervalues():
+            to_delete = set()
             for hash_, widget in widget_map.iteritems():
                 if widget_to_delete is widget:
-                    del widget_map[hash_]
+                    to_delete.add(hash_)
+            for hash_ in to_delete:
+                del widget_map[hash_]
 
 
 class QuickWidget(object):
@@ -308,3 +311,6 @@
     def onDelete(self):
         """Called when a widget is deleted"""
         log.debug(u"deleting widget {}".format(self)) # Must be implemented by frontends
+        if self.host.selected_widget == self:
+            self.host.selected_widget = None
+