wf-window-list: fix non-workspace-separated option never loading

applets/wf-window-list/__init__.py

@@ -363,8 +363,6 @@ class WFWindowList(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            363  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            364  
                                                def on_wf_event(self, source, condition):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            365  
                                                    if condition & GLib.IO_IN:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        366 -
                                                    if not self.show_only_this_wf_workspace:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        367 -
                                                        return True
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            366  
                                                        try:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            367  
                                                            message = self.wf_socket.read_next_event()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            368  
                                                            event = message.get("event")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -372,14 +370,15 @@ class WFWindowList(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            370  
                                                                case "view-workspace-changed":
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            371  
                                                                    view = message.get("view", {})
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            372  
                                                                    output = self.wf_socket.get_output(self.get_root().monitor_index + 1)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        375 -
                                                                current_workspace = output["workspace"]["x"], output["workspace"]["y"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        376 -
                                                                if (message["to"]["x"], message["to"]["y"]) == current_workspace:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        377 -
                                                                    if self.toplevel_buttons_by_wf_id[view["id"]].get_parent() is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        378 -
                                                                        self.append(self.toplevel_buttons_by_wf_id[view["id"]])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        379 -
                                                                else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        380 -
                                                                    if self.toplevel_buttons_by_wf_id[view["id"]].get_parent() is self:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        381 -
                                                                        # Remove out-of-workspace window
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        382 -
                                                                        self.remove(self.toplevel_buttons_by_wf_id[view["id"]])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        373 +
                                                                if view["output-id"] == self.get_root().monitor_index + 1:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        374 +
                                                                    current_workspace = output["workspace"]["x"], output["workspace"]["y"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        375 +
                                                                    if not self.show_only_this_wf_workspace or (message["to"]["x"], message["to"]["y"]) == current_workspace:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        376 +
                                                                        if self.toplevel_buttons_by_wf_id[view["id"]].get_parent() is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        377 +
                                                                            self.append(self.toplevel_buttons_by_wf_id[view["id"]])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        378 +
                                                                    else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        379 +
                                                                        if self.toplevel_buttons_by_wf_id[view["id"]].get_parent() is self:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        380 +
                                                                            # Remove out-of-workspace window
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        381 +
                                                                            self.remove(self.toplevel_buttons_by_wf_id[view["id"]])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            382  
                                                                case "wset-workspace-changed":
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            383  
                                                                    output_id = self.get_root().monitor_index + 1
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            384  
                                                                    if message["wset-data"]["output-id"] == output_id: