[Python-apps-commits] r1494 - in packages/emesene/trunk/debian (2 files)

[pochu-guest at users.alioth.debian.org]

    Date: Friday, June 27, 2008 @ 22:06:29
  Author: pochu-guest
Revision: 1494

* debian/patches/from_upstream_fix_gtk_image_loading.patch:
  - Patch from upstream r1394, loads an stock image if the personal one
    couldn't be loaded.

Added:
  packages/emesene/trunk/debian/patches/from_upstream_fix_gtk_image_loading.patch
Modified:
  packages/emesene/trunk/debian/changelog

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2008-06-25 19:06:20 UTC (rev 1493)
+++ packages/emesene/trunk/debian/changelog	2008-06-27 22:06:29 UTC (rev 1494)
@@ -1,12 +1,15 @@
-emesene (1.0-dist-3) UNRELEASED; urgency=low
+emesene (1.0-dist-3) unstable; urgency=low
 
   * debian/control:
     - Move python-gnome2-extras from Recommends to Suggests, as it's only
       needed for the Spell plugin and brings many modules and dependencies.
   * debian/emesene-launcher:
     - Pass arguments to Controller.py
+  * debian/patches/from_upstream_fix_gtk_image_loading.patch:
+    - Patch from upstream r1394, loads an stock image if the personal one
+      couldn't be loaded.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Fri, 13 Jun 2008 21:32:51 +0200
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 28 Jun 2008 00:06:21 +0200
 
 emesene (1.0-dist-2) unstable; urgency=low
 

Added: packages/emesene/trunk/debian/patches/from_upstream_fix_gtk_image_loading.patch
===================================================================
--- packages/emesene/trunk/debian/patches/from_upstream_fix_gtk_image_loading.patch	                        (rev 0)
+++ packages/emesene/trunk/debian/patches/from_upstream_fix_gtk_image_loading.patch	2008-06-27 22:06:29 UTC (rev 1494)
@@ -0,0 +1,27 @@
+Index: dialog.py
+===================================================================
+--- dialog.py	(revision 1393)
++++ dialog.py	(revision 1394)
+@@ -1037,13 +1037,15 @@
+             # if the file is smaller than 1MB we
+             # load it, otherwise we dont
+             if os.path.isfile(path) and os.path.getsize(path) <= 1000000:
+-                pixbuf = gtk.gdk.pixbuf_new_from_file(get_filename(self))
+-            
+-                if pixbuf.get_width() > 128 and pixbuf.get_height() > 128:
+-                    pixbuf = pixbuf.scale_simple(128, 128, 
+-                        gtk.gdk.INTERP_BILINEAR)
+-            
+-                self.image.set_from_pixbuf(pixbuf)
++                try:
++                    pixbuf = gtk.gdk.pixbuf_new_from_file(get_filename(self))
++                    if pixbuf.get_width() > 128 and pixbuf.get_height() > 128:
++                        pixbuf = pixbuf.scale_simple(128, 128, gtk.gdk.INTERP_BILINEAR)
++                    self.image.set_from_pixbuf(pixbuf)
++                    
++                except gobject.GError:
++                    self.image.set_from_stock(gtk.STOCK_DIALOG_ERROR, 
++                        gtk.ICON_SIZE_DIALOG)
+             else:
+                 self.image.set_from_stock(gtk.STOCK_DIALOG_ERROR, 
+                     gtk.ICON_SIZE_DIALOG)