Ticket #4044: gajim_not_only_first_message_notification_plus_thin_border.patch

gajim/data/glade/popup_notification_window.glade

@@ -4 +4 @@
 <glade-interface>
 
 <widget class="GtkWindow" id="popup_notification_window">
-  <property name="border_width">6</property>
+  <property name="border_width">1</property>
   <property name="width_request">312</property>
   <property name="height_request">95</property>
   <property name="title" translatable="yes"></property>

gajim/src/common/config.py

@@ -46 +46 @@
 
         __options = {
                 # name: [ type, default_value, help_string ]
+                'notify_only_on_the_first_message': [ opt_bool, True ],
                 'verbose': [ opt_bool, False, '', True ],
                 'alwaysauth': [ opt_bool, False ],
                 'autopopup': [ opt_bool, False ],

gajim/src/common/helpers.py

@@ -782 +782 @@
                         return True
                 if popup == 'no':
                         return False
-        if type and (not gajim.config.get(type) or not is_first_message):
+#-->if type and (not gajim.config.get(type) or not is_first_message): <--#
+        if type and (not gajim.config.get(type)):
+                return False
+        if type and not is_first_message and gajim.config.get('notify_only_on_the_first_message'):
                 return False
         if gajim.config.get('autopopupaway'): # always show notification
                 return True