[Xfce4-commits] <xfdesktop:master> Enable pseudo-transparent backgrounds again.

[Nick Schermer]

Updating branch refs/heads/master
         to fbd1dc724de6fae37084c265243ce05101d75468 (commit)
       from b33b01b799476ab680823fd4ded659bac6ac5123 (commit)

commit fbd1dc724de6fae37084c265243ce05101d75468
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Mar 31 18:58:45 2012 +0200

    Enable pseudo-transparent backgrounds again.

 src/xfce-desktop.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index 38a382f..e7dbedb 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -82,6 +82,9 @@
 #include "xfce-desktop.h"
 #include "xfce-desktop-enum-types.h"
 
+/* disable setting the x background for bug 7442 */
+//#define DISABLE_FOR_BUG7442
+
 struct _XfceDesktopPriv
 {
     GdkScreen *gscreen;
@@ -275,7 +278,7 @@ static void
 set_real_root_window_pixmap(GdkScreen *gscreen,
                             GdkPixmap *pmap)
 {
-#if 0 /* see bug #7442 */
+#ifndef DISABLE_FOR_BUG7442
     Window xid;
     GdkWindow *groot;
     
@@ -865,7 +868,7 @@ xfce_desktop_unrealize(GtkWidget *widget)
     gdk_property_delete(groot, gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE));
     gdk_property_delete(groot, gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE));
 
-#if 0 /* see bug #7442 */
+#ifndef DISABLE_FOR_BUG7442
     gdk_property_delete(groot, gdk_atom_intern("_XROOTPMAP_ID", FALSE));
     gdk_property_delete(groot, gdk_atom_intern("ESETROOT_PMAP_ID", FALSE));
     gdk_window_set_back_pixmap(groot, NULL, FALSE);