[Xfce4-commits] r24257 - in xfwm4/trunk: src themes/daloa themes/mopti

[Olivier Fourdan]

Author: olivier
Date: 2007-01-03 17:58:14 +0000 (Wed, 03 Jan 2007)
New Revision: 24257

Modified:
   xfwm4/trunk/src/client.c
   xfwm4/trunk/themes/daloa/Makefile.in
   xfwm4/trunk/themes/mopti/Makefile.in
Log:
Fix display of ARGB32 windows with compositing enabled but without compositor active.

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2007-01-03 12:04:34 UTC (rev 24256)
+++ xfwm4/trunk/src/client.c	2007-01-03 17:58:14 UTC (rev 24257)
@@ -1888,7 +1888,6 @@
         c->depth  = screen_info->depth;
     }
 
-#ifdef HAVE_COMPOSITOR
     if (c->depth == 32)
     {
         attributes.background_pixmap = None;
@@ -1896,8 +1895,6 @@
         attributes.background_pixel = 0;
         valuemask |= CWBackPixmap|CWBackPixel|CWBorderPixel;
     }
-#endif /* HAVE_COMPOSITOR */
-
 #else  /* HAVE_RENDER */
     /* We don't support multiple depth/visual w/out render */
     c->visual = screen_info->visual;

Modified: xfwm4/trunk/themes/daloa/Makefile.in
===================================================================
--- xfwm4/trunk/themes/daloa/Makefile.in	2007-01-03 12:04:34 UTC (rev 24256)
+++ xfwm4/trunk/themes/daloa/Makefile.in	2007-01-03 17:58:14 UTC (rev 24257)
@@ -97,6 +97,7 @@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -205,18 +206,15 @@
 XFCE_MCS_MANAGER_VERSION = @XFCE_MCS_MANAGER_VERSION@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
+XMKMF = @XMKMF@
 XSYNC_LIBS = @XSYNC_LIBS@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -233,12 +231,16 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -249,8 +251,10 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@

Modified: xfwm4/trunk/themes/mopti/Makefile.in
===================================================================
--- xfwm4/trunk/themes/mopti/Makefile.in	2007-01-03 12:04:34 UTC (rev 24256)
+++ xfwm4/trunk/themes/mopti/Makefile.in	2007-01-03 17:58:14 UTC (rev 24257)
@@ -97,6 +97,7 @@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -205,18 +206,15 @@
 XFCE_MCS_MANAGER_VERSION = @XFCE_MCS_MANAGER_VERSION@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
+XMKMF = @XMKMF@
 XSYNC_LIBS = @XSYNC_LIBS@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -233,12 +231,16 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -249,8 +251,10 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@