[26129] in Source-Commits
/svn/athena r25410 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Benjamin Barenblat)
Sun Sep 25 16:25:47 2011
Date: Sun, 25 Sep 2011 16:25:40 -0400
From: Benjamin Barenblat <bbaren@MIT.EDU>
Message-Id: <201109252025.p8PKPehC014966@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: bbaren
Date: 2011-09-25 16:25:40 -0400 (Sun, 25 Sep 2011)
New Revision: 25410
Added:
trunk/debathena/config/gdm-config/debian/debathena.png
Removed:
trunk/debathena/config/gdm-config/debian/debathena0.png
Modified:
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/debathena-branding
trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install
Log:
In gdm-config:
* Put original Debathena logo at its original filename.
* Make debathena-branding handle missing images gracefully.
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2011-09-25 20:21:40 UTC (rev 25409)
+++ trunk/debathena/config/gdm-config/debian/changelog 2011-09-25 20:25:40 UTC (rev 25410)
@@ -1,3 +1,10 @@
+debathena-gdm-config (1.34) unstable; urgency=low
+
+ * Put original Debathena logo at its original filename.
+ * Make debathena-branding handle missing images gracefully.
+
+ -- Benjamin Barenblat <bbaren@mit.edu> Sun, 25 Sep 2011 16:25:24 -0400
+
debathena-gdm-config (1.33) unstable; urgency=low
* Make Athena owl blink.
Modified: trunk/debathena/config/gdm-config/debian/debathena-branding
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-branding 2011-09-25 20:21:40 UTC (rev 25409)
+++ trunk/debathena/config/gdm-config/debian/debathena-branding 2011-09-25 20:25:40 UTC (rev 25410)
@@ -17,7 +17,7 @@
SM_CLIENT_DBUS_INTERFACE = "org.gnome.SessionManager.ClientPrivate"
APP_ID = "debathena-branding"
GLADE_FILE="/usr/share/debathena-branding/debathena-branding.glade"
-DEBATHENA_LOGO_FILES=["/usr/share/pixmaps/debathena0.png",
+DEBATHENA_LOGO_FILES=["/usr/share/pixmaps/debathena.png",
"/usr/share/pixmaps/debathena1.png",
"/usr/share/pixmaps/debathena2.png",
"/usr/share/pixmaps/debathena3.png",
@@ -101,13 +101,17 @@
def setup_owl(self, logoScale):
self.logo_pixbufs = []
num_pixbufs = 0
- # try:
- # Eyes go closed.
- for img in DEBATHENA_LOGO_FILES:
- pixbuf = gtk.gdk.pixbuf_new_from_file(img)
- self.logo_pixbufs.append(pixbuf.scale_simple(int(pixbuf.get_width() * logoScale), int(pixbuf.get_height() * logoScale), gtk.gdk.INTERP_BILINEAR))
- num_pixbufs += 1
+ try:
+ # Eyes go closed.
+ for img in DEBATHENA_LOGO_FILES:
+ pixbuf = gtk.gdk.pixbuf_new_from_file(img)
+ self.logo_pixbufs.append(pixbuf.scale_simple(int(pixbuf.get_width() * logoScale), int(pixbuf.get_height() * logoScale), gtk.gdk.INTERP_BILINEAR))
+ num_pixbufs += 1
+ except:
+ # Just don't display the image if it's missing
+ return False
+
# Eyes come open.
for pixbuf in self.logo_pixbufs[::-1]:
self.logo_pixbufs.append(pixbuf)
@@ -116,10 +120,6 @@
# Eyes stay open.
self.logo_pixbufs.extend([None] * (self.animation_loop_frames - num_pixbufs))
- # except:
- # # Just don't display the image if it's missing
- # return False
-
self.img_idx = -1
return True
Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install 2011-09-25 20:21:40 UTC (rev 25409)
+++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install 2011-09-25 20:25:40 UTC (rev 25410)
@@ -1,4 +1,4 @@
-debian/debathena0.png usr/share/pixmaps
+debian/debathena.png usr/share/pixmaps
debian/debathena1.png usr/share/pixmaps
debian/debathena2.png usr/share/pixmaps
debian/debathena3.png usr/share/pixmaps
Copied: trunk/debathena/config/gdm-config/debian/debathena.png (from rev 25409, trunk/debathena/config/gdm-config/debian/debathena0.png)
===================================================================
(Binary files differ)
