--- libvo/x11_common.c.debian	2007-02-22 13:50:30.000000000 +0100
+++ libvo/x11_common.c	2007-02-22 13:50:30.000000000 +0100
@@ -77,6 +77,7 @@
 static int dpms_disabled = 0;
 static int timeout_save = 0;
 static int kdescreensaver_was_running = 0;
+static int gnome_screensaver_was_running = 0;
 
 char *mDisplayName = NULL;
 Display *mDisplay = NULL;
@@ -1717,7 +1718,12 @@
             ("dcop kdesktop KScreensaverIface enable true 2>/dev/null >/dev/null");
         kdescreensaver_was_running = 0;
     }
-
+    if (gnome_screensaver_was_running && stop_xscreensaver)
+    {
+        system
+            ("gconftool-2 --type bool --set /apps/gnome-screensaver/idle_activation_enabled true 2>/dev/null >/dev/null");
+        gnome_screensaver_was_running = 0;
+    }
 
 }
 
@@ -1771,6 +1777,17 @@
             system
                 ("dcop kdesktop KScreensaverIface enable false 2>/dev/null >/dev/null");
     }
+    if (stop_xscreensaver && !gnome_screensaver_was_running)
+    {
+        gnome_screensaver_was_running =
+            (system
+             ("gconftool-2 --get /apps/gnome-screensaver/idle_activation_enabled | grep true 2>/dev/null >/dev/null")
+             == 0);
+        if (gnome_screensaver_was_running)
+            system
+                ("gconftool-2 --type bool --set /apps/gnome-screensaver/idle_activation_enabled false 2>/dev/null >/dev/null");
+    }
+
 }
 
 static XErrorHandler old_handler = NULL;