Ticket #2932: systray.diff

src/systray.py

@@ -285 +285 @@
                 gajim.interface.roster.on_quit_menuitem_activate(widget)
 
         def on_left_click(self):
+                on_left_click_recive = gajim.config.get('use_left_click_to_recive_messages')
                 win = gajim.interface.roster.window
-                # toggle visible/hidden for roster window
-                if win.get_property('visible'): # visible in ANY virtual desktop?
-
-                        # we could be in another VD right now. eg vd2
-                        # and we want to show it in vd2
-                        if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
-                                win.hide() # else we hide it from VD that was visible in
+                if len(gajim.events.get_systray_events()) == 0:
+                        #We check if there is present at least one inconming message
+                        #There's no need to check settings if there is not.
+                        #And we always change the visibility of roster
+                        if win.get_property('visible'): # visible in ANY virtual desktop?
+                                # we could be in another VD right now. eg vd2
+                                # and we want to show it in vd2
+                                if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
+                                        win.hide() # else we hide it from VD that was visible in
+                        else:
+                                # in Windows (perhaps other Window Managers too) minimize state
+                                # is remembered, so make sure it's not minimized (iconified)
+                                # because user wants to see roster
+                                win.deiconify()
+                                win.present()
                 else:
-                        # in Windows (perhaps other Window Managers too) minimize state
-                        # is remembered, so make sure it's not minimized (iconified)
-                        # because user wants to see roster
-                        win.deiconify()
-                        win.present()
+                        if on_left_click_recive == False:                       
+                                # use middle click to recive, so toggle visible/hidden for roster window
+                                if win.get_property('visible'): # visible in ANY virtual desktop?
+        
+                                        # we could be in another VD right now. eg vd2
+                                        # and we want to show it in vd2
+                                        if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
+                                                win.hide() # else we hide it from VD that was visible in
+                                else:
+                                        # in Windows (perhaps other Window Managers too) minimize state
+                                        # is remembered, so make sure it's not minimized (iconified)
+                                        # because user wants to see roster
+                                        win.deiconify()
+                                        win.present()
+                        else:
+                                #if user prefers to recive by left click, do it
+                                self.handle_first_event()
+                                
 
         def handle_first_event(self):
                 account, jid, event = gajim.events.get_first_systray_event()