changeset 2008:8a749ec21c50

primitivus: fixed notifications counter for simple messages in MUC rooms
author Goffi <goffi@goffi.org>
date Sun, 17 Jul 2016 17:12:42 +0200
parents 19b9d3f8a6c7
children 90134b2e3dc4
files frontends/src/primitivus/chat.py frontends/src/primitivus/primitivus
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/frontends/src/primitivus/chat.py	Sun Jul 17 16:47:33 2016 +0200
+++ b/frontends/src/primitivus/chat.py	Sun Jul 17 17:12:42 2016 +0200
@@ -450,6 +450,9 @@
                     entity=from_jid,
                     ))
                 self.host.notify(C.NOTIFY_MESSAGE, from_jid, msg, widget=self, profile=self.profile)
+            else:
+                self.host.notify(C.NOTIFY_MESSAGE, self.target, widget=self, profile=self.profile)
+
 
     def addUser(self, nick):
         occupant = super(Chat, self).addUser(nick)
--- a/frontends/src/primitivus/primitivus	Sun Jul 17 16:47:33 2016 +0200
+++ b/frontends/src/primitivus/primitivus	Sun Jul 17 17:12:42 2016 +0200
@@ -606,7 +606,8 @@
             # we ignore notification if the widget is selected but we can
             # still do a desktop notification is the X window has not the focus
             super(PrimitivusApp, self).notify(type_, entity, message, subject, callback, cb_args, widget, profile)
-        if not self.x_notify.hasFocus():
+        # we don't want notifications without message on desktop
+        if message is not None and not self.x_notify.hasFocus():
             if message is None:
                 message = _("{app}: a new event has just happened{entity}").format(
                     app=C.APP_NAME,