From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 3 Jul 2012 00:04:11 +0000 (-0400)
Subject: renaming the file to a slightly more descriptive name, or maybe not really.  renaming... 
X-Git-Tag: 2.140.90~1297
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=d46878850740c89b7a1d2f9ae9b7314905565396;p=feisty_meow.git

renaming the file to a slightly more descriptive name, or maybe not really.  renaming it at least.  also fixed the readme a bit for readability.
---

diff --git a/database/configuration/xscreensaver/readme.txt b/database/configuration/xscreensaver/readme.txt
index ffad94c3..61f28ab3 100644
--- a/database/configuration/xscreensaver/readme.txt
+++ b/database/configuration/xscreensaver/readme.txt
@@ -1,6 +1,7 @@
 
 
-how to fix your screensaver after ubuntu oneiric ocelot wipes everything out:
+how to fix your screensaver after ubuntu oneiric ocelot or later wipes
+xscreensaver out:
 
 this page has good info about most of what's needed:
   http://www.webupd8.org/2011/10/things-to-tweak-after-installing-ubuntu.html
diff --git a/database/configuration/xscreensaver/screenLock.py b/database/configuration/xscreensaver/screenLock.py
deleted file mode 100644
index 8e7838ce..00000000
--- a/database/configuration/xscreensaver/screenLock.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python
- 
-import dbus
-import dbus.service
-import dbus.glib
-import gobject
-import os
- 
-class ScreenDbusObj(dbus.service.Object):
-    def __init__(self):
-        session_bus = dbus.SessionBus()
-        bus_name=dbus.service.BusName("org.gnome.ScreenSaver",bus=session_bus)
-        dbus.service.Object.__init__(self,bus_name, '/org/gnome/ScreenSaver')
- 
-    @dbus.service.method("org.gnome.ScreenSaver")
-    def Lock(self):
-        os.system( "xscreensaver-command -lock" )
- 
- 
-if __name__ == '__main__':
-    object=ScreenDbusObj()
-    gobject.MainLoop().run()
-
diff --git a/database/configuration/xscreensaver/screenlock_dbus.py b/database/configuration/xscreensaver/screenlock_dbus.py
new file mode 100644
index 00000000..14785f1e
--- /dev/null
+++ b/database/configuration/xscreensaver/screenlock_dbus.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+import dbus
+import dbus.service
+import dbus.glib
+import gobject
+import os
+
+class ScreenDbusObj(dbus.service.Object):
+    def __init__(self):
+        # stuff the logging into a temporary and hidden directory.
+        try:
+            os.chdir(os.environ['HOME'] + "/.zz_temp_screenlock_menu");
+        except:
+            os.mkdir(os.environ['HOME'] + "/.zz_temp_screenlock_menu");
+            os.chdir(os.environ['HOME'] + "/.zz_temp_screenlock_menu");
+        session_bus = dbus.SessionBus()
+        bus_name=dbus.service.BusName("org.gnome.ScreenSaver",bus=session_bus)
+        dbus.service.Object.__init__(self,bus_name, '/org/gnome/ScreenSaver')
+
+    @dbus.service.method("org.gnome.ScreenSaver")
+    def Lock(self):
+        os.system( "xscreensaver-command -lock" )
+
+if __name__ == '__main__':
+    object=ScreenDbusObj()
+    gobject.MainLoop().run()
+