[Xfce4-commits] r23169 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2006-09-18 20:23:50 +0000 (Mon, 18 Sep 2006)
New Revision: 23169

Modified:
   xfwm4/trunk/src/compositor.c
Log:
Move compositor specific code within proper #ifdef portion (bug #2335).

Modified: xfwm4/trunk/src/compositor.c
===================================================================
--- xfwm4/trunk/src/compositor.c	2006-09-18 19:32:25 UTC (rev 23168)
+++ xfwm4/trunk/src/compositor.c	2006-09-18 20:23:50 UTC (rev 23169)
@@ -2428,6 +2428,25 @@
     }
 }
 
+static void
+compositorSetCMSelection (ScreenInfo *screen_info, Window w)
+{
+    DisplayInfo *display_info;
+    gchar selection[32];
+    Atom a;
+
+    g_return_if_fail (screen_info != NULL);
+
+    display_info = screen_info->display_info;
+    /* Newer EWMH standard property "_NET_WM_CM_S<n>" */
+    g_snprintf (selection, sizeof (selection), "_NET_WM_CM_S%d", screen_info->screen);
+    a = XInternAtom (display_info->dpy, selection, FALSE);
+    setXAtomManagerOwner (display_info, a, screen_info->xroot, w);
+
+    /* Older property "COMPOSITING_MANAGER" */
+    setAtomIdManagerOwner (display_info, COMPOSITING_MANAGER, screen_info->xroot, w);
+}
+
 #endif /* HAVE_COMPOSITOR */
 
 gboolean
@@ -2711,26 +2730,6 @@
 #endif /* HAVE_COMPOSITOR */
 }
 
-static void
-compositorSetCMSelection (ScreenInfo *screen_info, Window w)
-{
-    DisplayInfo *display_info;
-    gchar selection[32];
-    Atom a;
-
-    g_return_if_fail (screen_info != NULL);
-
-    display_info = screen_info->display_info;
-    /* Newer EWMH standard property "_NET_WM_CM_S<n>" */
-    g_snprintf (selection, sizeof (selection), "_NET_WM_CM_S%d", screen_info->screen);
-    a = XInternAtom (display_info->dpy, selection, FALSE);
-    setXAtomManagerOwner (display_info, a, screen_info->xroot, w);
-
-    /* Older property "COMPOSITING_MANAGER" */
-    setAtomIdManagerOwner (display_info, COMPOSITING_MANAGER, screen_info->xroot, w);
-}
-
-
 gboolean
 compositorManageScreen (ScreenInfo *screen_info)
 {