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

[Stephan Arts]

Author: stephan
Date: 2008-10-09 08:55:28 +0000 (Thu, 09 Oct 2008)
New Revision: 5541

Modified:
   ristretto/trunk/src/main_window.c
Log:
fix detection for xfdesktop (thanks to kelnos pointing me to xfdesktop_is_running in the xfdesktop-source)

Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c	2008-10-09 08:04:39 UTC (rev 5540)
+++ ristretto/trunk/src/main_window.c	2008-10-09 08:55:28 UTC (rev 5541)
@@ -431,44 +431,18 @@
     /** Set xfce-desktop as default when support has been compiled in */
     /* Check if xfdesktop is running */
     {
-        Atom actual_type;
-        int actual_format;
-        unsigned long n_items;
-        unsigned long bytes_after;
-        unsigned char *prop;
         gchar selection_name[100];
 
         GdkScreen *gdk_screen = gdk_screen_get_default();
         gint xscreen = gdk_screen_get_number(gdk_screen);
 
-
         g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen);
 
         Window root_window = GDK_ROOT_WINDOW();
-        Atom xfce_desktop_atom = XInternAtom (gdk_display, "XFCE_DESKTOP_WINDOW", False);
         Atom xfce_selection_atom = XInternAtom (gdk_display, selection_name, 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 > 0)
+        if((XGetSelectionOwner(GDK_DISPLAY(), xfce_selection_atom)))
         {
-            /* TODO: check XID */
-            /* Window xid = (Window) prop[1]; */
-            if(XGetSelectionOwner(gdk_display, xfce_selection_atom) == prop[1] != 0)
-                window->priv->settings.desktop = RSTTO_DESKTOP_XFCE;
-            else
-            {
-                g_debug("xfdesktop is not running");
-            }
+            window->priv->settings.desktop = RSTTO_DESKTOP_XFCE;
         }
         else
         {