[Pkg-cli-apps-commits] r3868 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/importdialog_missing_icon.dpatch

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

Author: diocles-guest
Date: Sat Apr  5 14:02:19 2008
New Revision: 3868

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3868
Log:
Use the GtkUtil.TryLoadIcon method to stop a crash when the f-spot icon is missing. Closes: #459261.

Added:
    packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3868&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sat Apr  5 14:02:19 2008
@@ -2,10 +2,13 @@
 
   * debian/patches/55-add-mimetype.dpatch:
     + Patch from Ubuntu for x-control/* mimetypes in .desktop file.
+  * debian/patches/importdialog_missing_icon.dpatch:
+    + Show a 'missing icon' image in the import dialog rather than
+      throwing an exception when f-spot icon is not found. (Closes: #459261)
   * debian/control:
     + Add line breaks to Build-Depends.
 
- -- Tim Retout <tim at retout.co.uk>  Thu, 20 Mar 2008 21:01:33 +0000
+ -- Tim Retout <tim at retout.co.uk>  Sat, 05 Apr 2008 14:58:05 +0100
 
 f-spot (0.4.2-1) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3868&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sat Apr  5 14:02:19 2008
@@ -5,6 +5,7 @@
 fix_libfspotjpegtran_linkage
 fix_cms_linkage
 link_system_libs
+importdialog_missing_icon
 
 # Bugfix for database updater
 fix_v8_db_update

Added: packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch?rev=3868&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch Sat Apr  5 14:02:19 2008
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## importdialog_missing_icon.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the GtkUtil.TryLoadIcon method to stop a crash when the f-spot icon 
+## DP: is missing. Closes: #459261.
+
+ at DPATCH@
+
+diff --git a/src/ImportCommand.cs b/src/ImportCommand.cs
+index d22d143..9001dff 100644
+--- a/src/ImportCommand.cs
++++ b/src/ImportCommand.cs
+@@ -624,7 +624,7 @@ public class ImportCommand : FSpot.GladeDialog
+ 		GtkUtil.ModifyColors (photo_scrolled);
+ 		GtkUtil.ModifyColors (photo_view);
+ 
+-		photo_view.Pixbuf = FSpot.Global.IconTheme.LoadIcon ("f-spot", 48, (Gtk.IconLookupFlags)0);
++		photo_view.Pixbuf = GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 48, (Gtk.IconLookupFlags)0);
+ 		photo_view.Fit = true;
+ 			
+ 		tag_entry = new FSpot.Widgets.TagEntry (MainWindow.Toplevel.Database.Tags, false);