[Xfce4-commits] r25833 - xfdesktop/trunk/src

[Jasper Huijsmans]

Author: jasper
Date: 2007-06-22 18:10:29 +0000 (Fri, 22 Jun 2007)
New Revision: 25833

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

Modified: xfdesktop/trunk/src/windowlist.c
===================================================================
--- xfdesktop/trunk/src/windowlist.c	2007-06-21 22:47:26 UTC (rev 25832)
+++ xfdesktop/trunk/src/windowlist.c	2007-06-22 18:10:29 UTC (rev 25833)
@@ -88,7 +88,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);
 }
 
@@ -295,7 +296,10 @@
             if(!mi)
                 continue;
             is_empty_workspace = FALSE;
-            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]));