--- espresso.orig/frontend/gtkui.py	2006-04-14 01:30:50.000000000 +0000
+++ espresso/frontend/gtkui.py	2006-04-19 03:14:14.000000000 +0000
@@ -128,9 +128,19 @@
         dbfilter = language.Language(self, DebconfCommunicator('espresso'))
         dbfilter.cleanup()
         dbfilter.db.shutdown()
-
-        gobject.timeout_add(30000, self.poke_gnome_screensaver)
-
+        
+        #FIXME: xubuntu uses xscreensaver  (nomed)
+        #       poke_gnome_screensaver --> turn_off_screensaver 
+        if os.path.isfile('/usr/bin/gnome-screensaver-command'):
+            gobject.timeout_add(30000, 
+                                self.turn_off_screensaver,
+                                "gnome-screensaver-command",
+                                "--poke")
+        elif os.path.isfile('/usr/bin/xscreensaver-command'):    
+            gobject.timeout_add(30000, 
+                                self.turn_off_screensaver,
+                                "xscreensaver-command",
+                                "--deactivate" )
         # To get a "busy mouse":
         self.watch = gtk.gdk.Cursor(gtk.gdk.WATCH)
 
@@ -262,7 +272,7 @@
         self.back.hide()
 
 
-    def poke_gnome_screensaver(self):
+    def turn_off_screensaver(self,command,opt):
         """Attempt to make sure that the screensaver doesn't kick in."""
         def drop_privileges():
             if 'SUDO_GID' in os.environ:
@@ -271,8 +281,7 @@
             if 'SUDO_UID' in os.environ:
                 uid = int(os.environ['SUDO_UID'])
                 os.setreuid(uid, uid)
-
-        gobject.spawn_async(["gnome-screensaver-command", "--poke"],
+        gobject.spawn_async([command, opt], # ["gnome-screensaver-command", "--poke"]
                             flags=(gobject.SPAWN_SEARCH_PATH |
                                    gobject.SPAWN_STDOUT_TO_DEV_NULL),
                             child_setup=drop_privileges)
@@ -898,6 +907,7 @@
             self.mountpoint_error_image.show()
             return
 
+        # FIXME: xubuntu doesn't use gconf
         gvm_automount_drives = '/desktop/gnome/volume_manager/automount_drives'
         gvm_automount_media = '/desktop/gnome/volume_manager/automount_media'
         gconf_dir = 'xml:readwrite:%s' % os.path.expanduser('~/.gconf')