[26655] in Source-Commits
/svn/athena r25679 - trunk/debathena/config/lightdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Aug 1 10:41:07 2012
Date: Wed, 1 Aug 2012 10:41:05 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208011441.q71Ef5js005450@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-01 10:41:05 -0400 (Wed, 01 Aug 2012)
New Revision: 25679
Modified:
trunk/debathena/config/lightdm-config/debian/changelog
trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter
Log:
In lightdm-config:
* If the nologin file exists when the greeter is spawned, then prevent
logins
Modified: trunk/debathena/config/lightdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/lightdm-config/debian/changelog 2012-08-01 14:12:41 UTC (rev 25678)
+++ trunk/debathena/config/lightdm-config/debian/changelog 2012-08-01 14:41:05 UTC (rev 25679)
@@ -13,8 +13,10 @@
* Deal more gracefully with a missing background image
* Move greeter to /usr/lib/debathena-lightdm-config
* Support multiple monitors (Trac: #1031)
+ * If the nologin file exists when the greeter is spawned, then prevent
+ logins
- -- Jonathan Reed <jdreed@mit.edu> Tue, 24 Jul 2012 18:21:25 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 01 Aug 2012 10:41:00 -0400
debathena-lightdm-config (1.3) unstable; urgency=low
Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter
===================================================================
--- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter 2012-08-01 14:12:41 UTC (rev 25678)
+++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter 2012-08-01 14:41:05 UTC (rev 25679)
@@ -197,6 +197,10 @@
rw = Gdk.get_default_root_window()
rw.set_cursor(Gdk.Cursor(Gdk.CursorType.LEFT_PTR))
self.noLoginMonitor = Gio.File.new_for_path(self.nologinFile).monitor_file(Gio.FileMonitorFlags.NONE, None)
+ # Check if the file is there right now...
+ if os.path.isfile(self.nologinFile):
+ self.loginNotebook.set_current_page(1)
+ # and then connect
self.noLoginMonitor.connect("changed", self._file_changed)
if not os.path.exists(KIOSK_LAUNCH_CMD):
