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

[Stephan Arts]

Author: stephan
Date: 2008-05-06 22:20:27 +0000 (Tue, 06 May 2008)
New Revision: 4743

Modified:
   ristretto/trunk/src/main_window.c
Log:
Should this check work!?


Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c	2008-05-06 16:03:41 UTC (rev 4742)
+++ ristretto/trunk/src/main_window.c	2008-05-06 22:20:27 UTC (rev 4743)
@@ -36,7 +36,9 @@
 #include "picture_viewer.h"
 #include "main_window.h"
 
+#define XFDESKTOP_SELECTION_FMT "XFDESKTOP_SELECTION_%d"
 
+
 struct _RsttoMainWindowPriv
 {
     RsttoNavigator *navigator;
@@ -424,9 +426,17 @@
         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, True);
         XGetWindowProperty (gdk_display, 
                             root_window,
                             xfce_desktop_atom,
@@ -443,8 +453,17 @@
         {
             /* TODO: check XID */
             /* Window xid = (Window) prop[1]; */
-            window->priv->settings.desktop = RSTTO_DESKTOP_XFCE;
+            if(XGetSelectionOwner(gdk_display, xfce_selection_atom) == prop[1])
+                window->priv->settings.desktop = RSTTO_DESKTOP_XFCE;
+            else
+            {
+                g_debug("xfdesktop is not running");
+            }
         }
+        else
+        {
+            g_debug("xfdesktop is not running");
+        }
     }
 #endif
 #endif