[Xfce4-commits] r25834 - xfce4-panel/branches/xfce_4_4/plugins/windowlist

[Jasper Huijsmans]

Author: jasper
Date: 2007-06-22 18:18:46 +0000 (Fri, 22 Jun 2007)
New Revision: 25834

Modified:
   xfce4-panel/branches/xfce_4_4/plugins/windowlist/windowlist.c
Log:
Don't set workspace for sticky windows. Possibly related to bug #3317.

Modified: xfce4-panel/branches/xfce_4_4/plugins/windowlist/windowlist.c
===================================================================
--- xfce4-panel/branches/xfce_4_4/plugins/windowlist/windowlist.c	2007-06-22 18:10:29 UTC (rev 25833)
+++ xfce4-panel/branches/xfce_4_4/plugins/windowlist/windowlist.c	2007-06-22 18:18:46 UTC (rev 25834)
@@ -193,7 +193,10 @@
     if (ev->button == 1) /* Goto workspace and show window */
     {
         gtk_menu_popdown (GTK_MENU (mi->parent));
-        netk_workspace_activate(netk_window_get_workspace(window));
+        if (!netk_window_is_sticky (window))
+        {
+            netk_workspace_activate(netk_window_get_workspace(window));
+        }
 	netk_window_activate (window);
         g_signal_emit_by_name (mi->parent, "deactivate", 0);
     }
@@ -575,7 +578,8 @@
                                             bold);
                 }
             }
-	    else if (netk_workspace != active_workspace)
+	    else if (netk_workspace != active_workspace && 
+                     !netk_window_is_sticky (window))
             {
                 gtk_widget_modify_fg (gtk_bin_get_child (GTK_BIN (mi)),
                         GTK_STATE_NORMAL,