[Python-apps-commits] r8155 - in packages/catfish/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, February 9, 2012 @ 01:57:04
  Author: jwilk
Revision: 8155

Prevent program crashing when an icon is missing from the icon theme.

Added:
  packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch
Modified:
  packages/catfish/trunk/debian/changelog
  packages/catfish/trunk/debian/patches/00list

Modified: packages/catfish/trunk/debian/changelog
===================================================================
--- packages/catfish/trunk/debian/changelog	2012-02-09 00:59:40 UTC (rev 8154)
+++ packages/catfish/trunk/debian/changelog	2012-02-09 01:57:04 UTC (rev 8155)
@@ -13,8 +13,11 @@
   * Bump to Standards-Version 3.9.2 (no changes needed).
   * Add ${misc:Depends} to Depends.
   * Add build-arch and build-indep target. Make binary-arch target do nothing.
+  * Prevent program crashing when an icon is missing from the icon theme
+    (closes: #655430). Thanks to Carlos Kosloff for the bug report and John
+     Church for the initial patch.
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 09 Feb 2012 01:58:57 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 09 Feb 2012 02:44:55 +0100
 
 catfish (0.3.2-1) unstable; urgency=low
 

Modified: packages/catfish/trunk/debian/patches/00list
===================================================================
--- packages/catfish/trunk/debian/patches/00list	2012-02-09 00:59:40 UTC (rev 8154)
+++ packages/catfish/trunk/debian/patches/00list	2012-02-09 01:57:04 UTC (rev 8155)
@@ -1,3 +1,4 @@
 10Fix_makefile.dpatch
 20Fix_desktopfile.dpatch
 30Fix_tracker_backend.dpatch
+40Fix_gtkiconload.dpatch

Added: packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch
===================================================================
--- packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch	                        (rev 0)
+++ packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch	2012-02-09 01:57:04 UTC (rev 8155)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40Fix_gtkiconload.dpatch by Jakub Wilk <jwilk at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Prevent program crashing when an icon is missing from the icon theme.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' catfish-0.3.2~/catfish.py catfish-0.3.2/catfish.py
+--- catfish-0.3.2~/catfish.py	2012-02-09 02:50:32.000000000 +0100
++++ catfish-0.3.2/catfish.py	2012-02-09 02:51:33.823351096 +0100
+@@ -707,9 +707,12 @@
+             return self.icon_cache[name]
+         except KeyError:
+             icon_size = gtk.icon_size_lookup(icon_size)[0]
+-            icon = self.icon_theme.load_icon(name, icon_size, 0)
+-            self.icon_cache[name] = icon
+-            return icon
++            try:
++                icon = self.icon_theme.load_icon(name, icon_size, 0)
++                self.icon_cache[name] = icon
++                return icon
++            except gobject.GError:
++                return
+ 
+     def get_thumbnail(self, path, icon_size=0, mime_type=None):
+         """Try to fetch a small thumbnail."""


Property changes on: packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch
___________________________________________________________________
Added: svn:executable
   + *