[26559] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r25624 - trunk/debathena/config/lightdm-config/debian

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jul 8 14:02:33 2012

Date: Sun, 8 Jul 2012 14:02:31 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207081802.q68I2VLj011668@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2012-07-08 14:02:31 -0400 (Sun, 08 Jul 2012)
New Revision: 25624

Modified:
   trunk/debathena/config/lightdm-config/debian/changelog
   trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter
Log:
In lightdm-config:
  * Be clearer about what a DBus error probably means when initiating a
    restart/shutdown from lightdm


Modified: trunk/debathena/config/lightdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/lightdm-config/debian/changelog	2012-07-08 02:14:01 UTC (rev 25623)
+++ trunk/debathena/config/lightdm-config/debian/changelog	2012-07-08 18:02:31 UTC (rev 25624)
@@ -1,3 +1,10 @@
+debathena-lightdm-config (1.4) unstable; urgency=low
+
+  * Be clearer about what a DBus error probably means when initiating a
+    restart/shutdown from lightdm
+
+ -- Jonathan Reed <jdreed@mit.edu>  Sun, 08 Jul 2012 14:03:47 -0400
+
 debathena-lightdm-config (1.3) unstable; urgency=low
 
   * Switch to config-package-dev instead of trying to place nice with what

Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter
===================================================================
--- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter	2012-07-08 02:14:01 UTC (rev 25623)
+++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter	2012-07-08 18:02:31 UTC (rev 25624)
@@ -210,7 +210,7 @@
                 elif self.builder.get_object("rbSuspend").get_active():
                     LightDM.suspend()
             except GLib.GError, e:
-                self.errDialog(str(e))
+                self.errDialog("An error occurred while trying to perform a power-related operation.  The most common cause of this is trying to shutdown, reboot, or suspend the machine when someone else is logged in remotely or on one of the virtual terminals.  The full error text appears below:\n\n" + str(e))
         self.powerDlg.hide()
 
     def showAccessDialog(self, widget):


home help back first fref pref prev next nref lref last post