[Pkg-cli-apps-commits] r3906 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/svn-042-3821_tag-icon-from-external-file.dpatch

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

Author: diocles-guest
Date: Wed Apr 16 00:00:59 2008
New Revision: 3906

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3906
Log:
Fix from upstream for crash in tag icon file chooser. (Closes: #470787)

Added:
    packages/f-spot/trunk/debian/patches/svn-042-3821_tag-icon-from-external-file.dpatch   (with props)
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=3906&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Wed Apr 16 00:00:59 2008
@@ -5,6 +5,9 @@
   * debian/patches/svn-042-3817_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/patches/svn-042-3821_tag-icon-from-external-file.dpatch:
+    + Fix from upstream SVN for crash in tag icon file chooser.
+      (Closes: #470787)
   * debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch:
     + Use upstream's version of the gtkhtml-sharp-3.14 port, and remove
       debian/patches/gtkhtml-sharp-3.14_port.dpatch.
@@ -22,7 +25,7 @@
     status; svn-042-* are on upstream SVN trunk, stable-042-* are from the
     upstream stable SVN branch, and debian_* patches are not upstream.
 
- -- Tim Retout <tim at retout.co.uk>  Tue, 15 Apr 2008 23:46:17 +0100
+ -- Tim Retout <tim at retout.co.uk>  Wed, 16 Apr 2008 00:57:58 +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=3906&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Wed Apr 16 00:00:59 2008
@@ -11,6 +11,7 @@
 svn-042-3743_gallery-extension-install-hook
 svn-042-3754_deleting-1000-photos
 svn-042-3817_importdialog-missing-icon
+svn-042-3821_tag-icon-from-external-file
 
 # Patches that haven't been applied upstream yet.
 debian_libfspot-linkage

Added: packages/f-spot/trunk/debian/patches/svn-042-3821_tag-icon-from-external-file.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn-042-3821_tag-icon-from-external-file.dpatch?rev=3906&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/svn-042-3821_tag-icon-from-external-file.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/svn-042-3821_tag-icon-from-external-file.dpatch Wed Apr 16 00:00:59 2008
@@ -1,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## tag-icon-from-external-file.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix from upstream SVN r3821 for crash when browsing for an external
+## DP: file in the tag icon dialog. (Closes: #470787)
+
+ at DPATCH@
+diff -urNad f-spot~/src/TagCommands.cs f-spot/src/TagCommands.cs
+--- f-spot~/src/TagCommands.cs	2008-04-15 23:50:45.000000000 +0100
++++ f-spot/src/TagCommands.cs	2008-04-16 00:56:26.000000000 +0100
+@@ -17,6 +17,7 @@
+ using Mono.Unix;
+ using FSpot;
+ using FSpot.Utils;
++using FSpot.UI.Dialog;
+ 
+ public class TagCommands {
+ 
+@@ -377,10 +378,24 @@
+ 
+ 		private void CreateTagIconFromExternalPhoto ()
+ 		{
+-			using (FSpot.ImageFile img = FSpot.ImageFile.Create(new Uri(external_photo_chooser.Uri))) {
+-				using (Gdk.Pixbuf external_image = img.Load ()) {
+-					PreviewPixbuf = PixbufUtils.TagIconFromPixbuf (external_image);
++			try {
++				using (FSpot.ImageFile img = FSpot.ImageFile.Create(new Uri(external_photo_chooser.Uri))) {
++					using (Gdk.Pixbuf external_image = img.Load ()) {
++						PreviewPixbuf = PixbufUtils.TagIconFromPixbuf (external_image);
++					}
+ 				}
++			} catch (Exception e) {
++				string caption = Catalog.GetString ("Unable to load image");
++				string message = String.Format (Catalog.GetString ("Unable to load \"{0}\" as icon for the tag"), 
++									external_photo_chooser.Uri.ToString ());
++				HigMessageDialog md = new HigMessageDialog (this.Dialog, 
++									    DialogFlags.DestroyWithParent,
++									    MessageType.Error,
++									    ButtonsType.Close,
++									    caption, 
++									    message);
++				md.Run();
++				md.Destroy();
+ 			}
+ 		}
+ 

Propchange: packages/f-spot/trunk/debian/patches/svn-042-3821_tag-icon-from-external-file.dpatch
------------------------------------------------------------------------------
    svn:executable = *