[Goodies-commits] r4735 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2008-05-05 21:39:45 +0000 (Mon, 05 May 2008)
New Revision: 4735

Modified:
   ristretto/trunk/src/main_window.c
Log:
Auto-detect if xfdesktop is running


Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c	2008-05-05 21:11:18 UTC (rev 4734)
+++ ristretto/trunk/src/main_window.c	2008-05-05 21:39:45 UTC (rev 4735)
@@ -419,11 +419,33 @@
     /** Set xfce-desktop as default when support has been compiled in */
     /* Check if xfdesktop is running */
     {
+        Atom actual_type;
+        int actual_format;
+        int max_len = 10000;
+        unsigned long n_items;
+        unsigned long bytes_after;
+        unsigned char *prop;
+
         Window root_window = GDK_ROOT_WINDOW();
-        GdkAtom xfce_desktop_atom = gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE);
-                           
-
-        window->priv->settings.desktop = RSTTO_DESKTOP_XFCE;
+        Atom xfce_desktop_atom = XInternAtom (gdk_display, "XFCE_DESKTOP_WINDOW", False);
+        XGetWindowProperty (gdk_display, 
+                            root_window,
+                            xfce_desktop_atom,
+                            0,
+                            1,
+                            False,
+                            AnyPropertyType,
+                            &actual_type,
+                            &actual_format,
+                            &n_items,
+                            &bytes_after,
+                            &prop);
+        if (n_items == 1)
+        {
+            /* TODO: check XID */
+            Window xid = (Window) prop[1];
+            window->priv->settings.desktop = RSTTO_DESKTOP_XFCE;
+        }
     }
 #endif
 #endif