[Xfce4-commits] r24034 - xfce4-panel/trunk/plugins/iconbox

[Jasper Huijsmans]

Author: jasper
Date: 2006-12-02 20:00:01 +0000 (Sat, 02 Dec 2006)
New Revision: 24034

Modified:
   xfce4-panel/trunk/plugins/iconbox/iconbox.c
Log:
Switch to workspace of window before activating it, if necessary.

Modified: xfce4-panel/trunk/plugins/iconbox/iconbox.c
===================================================================
--- xfce4-panel/trunk/plugins/iconbox/iconbox.c	2006-12-02 05:41:00 UTC (rev 24033)
+++ xfce4-panel/trunk/plugins/iconbox/iconbox.c	2006-12-02 20:00:01 UTC (rev 24034)
@@ -194,9 +194,24 @@
     if (ev->button == 1)
     {
         if (netk_window_is_active (icon->window))
+        {
             netk_window_minimize (icon->window);
+        }
         else
+        {
+            NetkScreen    *scr;
+            NetkWorkspace *aws, *ws;
+
+            scr = netk_window_get_screen (icon->window);
+            aws = netk_screen_get_active_workspace (scr);
+            ws  = netk_window_get_workspace (icon->window);
+
+            if (aws != ws)
+            {
+                netk_workspace_activate (ws);
+            }
             netk_window_activate (icon->window);
+        }
 
         return TRUE;
     }