[Xfce4-commits] <xfce4-panel:master> Make viewports work in the tasklist (bug #6898).

[Nick Schermer]

Updating branch refs/heads/master
         to 8af236af7d57e8fb4916d2bce9339a29097f6dad (commit)
       from c0cbe8aae6cefd127b043e7b5906104ac3af1033 (commit)

commit 8af236af7d57e8fb4916d2bce9339a29097f6dad
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Nov 30 19:16:16 2010 +0100

    Make viewports work in the tasklist (bug #6898).

 plugins/tasklist/tasklist-dialog.glade |    2 +-
 plugins/tasklist/tasklist-widget.c     |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/tasklist/tasklist-dialog.glade b/plugins/tasklist/tasklist-dialog.glade
index 694e884..beb5953 100644
--- a/plugins/tasklist/tasklist-dialog.glade
+++ b/plugins/tasklist/tasklist-dialog.glade
@@ -256,7 +256,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="include-all-workspaces">
-                            <property name="label" translatable="yes">Show windows from _all workspaces</property>
+                            <property name="label" translatable="yes">Show windows from _all workspaces or viewports</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index ebabd53..92549b1 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -1568,12 +1568,16 @@ static void
 xfce_tasklist_viewports_changed (WnckScreen   *screen,
                                  XfceTasklist *tasklist)
 {
+  WnckWorkspace *active_ws;
+
   panel_return_if_fail (WNCK_IS_SCREEN (screen));
   panel_return_if_fail (XFCE_IS_TASKLIST (tasklist));
   panel_return_if_fail (tasklist->screen == screen);
 
-  /* TODO, rebuild the tasklist (only when we filter windows on
-   * this monitor?) */
+  /* pretend we changed workspace, this will update the
+   * visibility of all the buttons */
+  active_ws = wnck_screen_get_active_workspace (screen);
+  xfce_tasklist_active_workspace_changed (screen, active_ws, tasklist);
 }