Author: olivier
Date: 2006-10-14 07:28:25 +0000 (Sat, 14 Oct 2006)
New Revision: 23411
Modified:
xfwm4/trunk/src/main.c
Log:
Yet, again, compositing initialization.
Modified: xfwm4/trunk/src/main.c
===================================================================
--- xfwm4/trunk/src/main.c 2006-10-14 07:20:27 UTC (rev 23410)
+++ xfwm4/trunk/src/main.c 2006-10-14 07:28:25 UTC (rev 23411)
@@ -457,18 +457,29 @@
}
else if (compositor_mode == COMPOSITOR_MODE_MANUAL)
{
- /*
- 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 */
+ gboolean xfwm4_compositor;
+
+ xfwm4_compositor = TRUE;
if (screen_info->params->use_compositing)
{
- compositorManageScreen (screen_info);
+ /* Enable compositor if "use compositing" is enabled */
+ xfwm4_compositor = compositorManageScreen (screen_info);
}
+ /*
+ The user may want to use the manual compositing, but the
installed
+ system may not support it, so we need to double check, to see if
+ initialization of the compositor was successful.
+ */
+ if (xfwm4_compositor)
+ {
+ /*
+ 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);
+ }
}
sn_init_display (screen_info);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
