Author: olivier
Date: 2006-10-13 20:48:00 +0000 (Fri, 13 Oct 2006)
New Revision: 23407

Modified:
   xfwm4/trunk/src/main.c
Log:
Fix compositing, again... Bug #2428.

Modified: xfwm4/trunk/src/main.c
===================================================================
--- xfwm4/trunk/src/main.c      2006-10-13 20:31:42 UTC (rev 23406)
+++ xfwm4/trunk/src/main.c      2006-10-13 20:48:00 UTC (rev 23407)
@@ -455,17 +455,19 @@
         {
             compositorManageScreen (screen_info);
         }
-        else if ((compositor_mode == COMPOSITOR_MODE_MANUAL) && 
(screen_info->params->use_compositing))
+        else if (compositor_mode == COMPOSITOR_MODE_MANUAL)
         {
-            if (compositorManageScreen (screen_info))
+            /*
+               Acquire selection on XFWM4_COMPOSITING_MANAGER to advertise our 
own
+               compositing manager (used by WM tweaks to determine whether or 
not
+               show the "compositor" tab.
+             */
+            setAtomIdManagerOwner (display_info, XFWM4_COMPOSITING_MANAGER,
+                                   screen_info->xroot, screen_info->xfwm4_win);
+            /* And enable compositor if "use compositing" is enabled */
+            if (screen_info->params->use_compositing)
             {
-                /*
-                   Acquire selection on XFWM4_COMPOSITING_MANAGER to advertise 
our own
-                   compositing manager (used by WM tweaks to determine whether 
or not
-                   show the "compositor" tab.
-                 */
-                setAtomIdManagerOwner (display_info, XFWM4_COMPOSITING_MANAGER,
-                                       screen_info->xroot, 
screen_info->xfwm4_win);
+                compositorManageScreen (screen_info);
             }
         }
 

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to