[26438] in Source-Commits
/svn/athena r25574 - trunk/debathena/config/lightdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jun 5 16:39:29 2012
Date: Tue, 5 Jun 2012 16:39:27 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206052039.q55KdRWk019516@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-05 16:39:27 -0400 (Tue, 05 Jun 2012)
New Revision: 25574
Modified:
trunk/debathena/config/lightdm-config/debian/changelog
trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter
Log:
In lightdm-config:
* It's GLib.GError, not Glib.Gerror
Modified: trunk/debathena/config/lightdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/lightdm-config/debian/changelog 2012-06-05 20:22:26 UTC (rev 25573)
+++ trunk/debathena/config/lightdm-config/debian/changelog 2012-06-05 20:39:27 UTC (rev 25574)
@@ -5,8 +5,9 @@
GtkBuilder bugs
* The greeter needs to keep track of whether the user hit Cancel or not
in LightDM 1.0 (oneiric)
+ * It's GLib.GError, not Glib.Gerror
- -- Jonathan Reed <jdreed@mit.edu> Mon, 04 Jun 2012 11:54:12 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 05 Jun 2012 16:39:17 -0400
debathena-lightdm-config (1.1) unstable; urgency=low
Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter
===================================================================
--- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter 2012-06-05 20:22:26 UTC (rev 25573)
+++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter 2012-06-05 20:39:27 UTC (rev 25574)
@@ -209,7 +209,7 @@
LightDM.hibernate()
elif self.builder.get_object("rbSuspend").get_active():
LightDM.suspend()
- except Glib.Gerror, e:
+ except GLib.GError, e:
self.errDialog(str(e))
self.powerDlg.hide()
@@ -439,7 +439,7 @@
pixbuf = GdkPixbuf.Pixbuf.new_from_file(img)
self.logo_pixbufs.append(pixbuf.scale_simple(int(pixbuf.get_width() * logoScale), int(pixbuf.get_height() * logoScale), GdkPixbuf.InterpType.BILINEAR))
num_pixbufs += 1
- except Glib.Gerror, e:
+ except GLib.GError, e:
print >> sys.stderr, "Glib Error:", e
return False
# Eyes come open.
