[26412] in Source-Commits
Re: /svn/athena r25553 - in trunk/debathena/debathena/kiosk: .
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Sun Jun 3 15:02:47 2012
Date: Sun, 3 Jun 2012 15:02:43 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201206031826.q53IQoIY009183@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1206031457390.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
On Sun, 3 Jun 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-06-03 14:26:50 -0400 (Sun, 03 Jun 2012)
> New Revision: 25553
>
> Modified:
> trunk/debathena/debathena/kiosk/debian/changelog
> trunk/debathena/debathena/kiosk/gdm-launch-kiosk
> Log:
> In kiosk:
> * Don't launch the kiosk mode if an update is in progress (Trac: #1006)
>
>
> Modified: trunk/debathena/debathena/kiosk/gdm-launch-kiosk
> ===================================================================
> --- trunk/debathena/debathena/kiosk/gdm-launch-kiosk 2012-06-03 16:28:23 UTC (rev 25552)
> +++ trunk/debathena/debathena/kiosk/gdm-launch-kiosk 2012-06-03 18:26:50 UTC (rev 25553)
> @@ -52,7 +52,16 @@
>
> def kioskButton_on_click(self, button):
> if not self.sessionEnding:
> - self.kioskDialog.run()
> + if os.path.exists("/var/run/athena-nologin"):
> + errDlg = gtk.MessageDialog(None,
> + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
> + gtk.MESSAGE_ERROR,
> + gtk.BUTTONS_CLOSE,
> + "This machine is currently taking an update and the kiosk browser can't be launched. Please try again later.")
Do we want newlines in the string or does it wrap automatically?
> + errDlg.run()
> + errDlg.destroy()
Any idea how hard it would be to put a timeout on the lifespan of errDlg?
I am envisioning someone trying to run the kiosk on a machine taking
updates and just leaving the error dialog up until the next person walks
by.
I suppose DIALOG_DESTROY_WITH_PARENT could help us out ... but we set
Parent=None?
-Ben
> + else:
> + self.kioskDialog.run()
>
> def kioskDialogResponseHandler(self, dialog, response_id):
> if response_id == 1 and not self.sessionEnding:
>
>
