[Xfce4-commits] r25835 - xfdesktop/branches/xfce_4_4/src

[Jasper Huijsmans]

Author: jasper
Date: 2007-06-22 18:30:04 +0000 (Fri, 22 Jun 2007)
New Revision: 25835

Modified:
   xfdesktop/branches/xfce_4_4/src/windowlist.c
Log:
Don't set workspace for sticky windows. Possibly related to bug #3317.

Modified: xfdesktop/branches/xfce_4_4/src/windowlist.c
===================================================================
--- xfdesktop/branches/xfce_4_4/src/windowlist.c	2007-06-22 18:18:46 UTC (rev 25834)
+++ xfdesktop/branches/xfce_4_4/src/windowlist.c	2007-06-22 18:30:04 UTC (rev 25835)
@@ -85,7 +85,8 @@
 {
     NetkWindow *netk_window = user_data;
     
-    netk_workspace_activate(netk_window_get_workspace(netk_window));
+    if(!netk_window_is_sticky(netk_window))
+        netk_workspace_activate(netk_window_get_workspace(netk_window));
     netk_window_activate(netk_window);
 }
 
@@ -266,7 +267,10 @@
             mi = menu_item_from_netk_window(netk_window, w, h);
             if(!mi)
                 continue;
-            if(netk_workspace != active_workspace) {
+            if(netk_workspace != active_workspace 
+                    && (!netk_window_is_sticky(netk_window)
+                        || netk_workspace != active_workspace))
+            {
                 GtkWidget *lbl = gtk_bin_get_child(GTK_BIN(mi));
                 gtk_widget_modify_fg(lbl, GTK_STATE_NORMAL,
                         &(style->fg[GTK_STATE_INSENSITIVE]));