[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.7.0-1-16-g75c0894

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit 47ae8214ce1fd455100004aa5ab903774d3eb8e8
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Jul 14 12:23:04 2010 +0100

    Drop ubuntu_fix_export_crash_FlickrRemote.cs.patch: Fixed upstream

diff --git a/debian/patches/series b/debian/patches/series
index c35e68f..91a6d28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 
 # ubuntu_importer-targetdir-selector.patch
 
-ubuntu_fix_export_crash_FlickrRemote.cs.patch
 ubuntu_xdg-photo-dir.patch
 
 #ubuntu_add_editing_to_view_mode.patch
diff --git a/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.patch b/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.patch
deleted file mode 100644
index 3c10b0d..0000000
--- a/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ubuntu_fix_export_crash_FlickrRemote.cs.dpatch by  <Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>>
-##
-## DP: Do not crash when exporting to flickr and having internet connectivity issues
-## DP: LP: #320602
-## DP: http://bugzilla.gnome.org/show_bug.cgi?id=553518
-
- at DPATCH@
-Index: f-spot.git/extensions/Exporters/FlickrExport/FlickrRemote.cs
-===================================================================
---- f-spot.git.orig/extensions/Exporters/FlickrExport/FlickrRemote.cs	2010-06-16 22:02:59.000000000 +0100
-+++ f-spot.git/extensions/Exporters/FlickrExport/FlickrRemote.cs	2010-06-16 22:24:53.868601972 +0100
-@@ -17,6 +17,7 @@
- using FSpot;
- using FSpot.Utils;
- using FSpot.Filters;
-+using FSpot.UI.Dialog;
- using Hyena;
- 
- public class FlickrRemote {
-@@ -104,6 +105,7 @@
- 
- 	public Auth CheckLogin ()
- 	{
-+	   try {
- 		if (frob == null) {
- 			frob = flickr.AuthGetFrob ();
- 			if (frob ==  null) {
-@@ -111,6 +113,13 @@
- 				return null;
- 			}
- 		}
-+ 	   } catch (Exception e) {
-+	       Console.WriteLine("{0} Exception caught.",e);
-+	       HigMessageDialog md = new HigMessageDialog (null,Gtk.DialogFlags.Modal |Gtk.DialogFlags.DestroyWithParent,Gtk.MessageType.Error, Gtk.ButtonsType.Ok,Mono.Unix.Catalog.GetString("Error reading server response"),String.Format( Mono.Unix.Catalog.GetString("The following error was encountered while attempting to log in: {0}"), e.Message));
-+	       md.Run();     
-+	       md.Destroy();
-+	       return null;
-+           }
- 
- 		if (token == null) {
- 			try {
-@@ -195,10 +204,17 @@
- 	}
- 
- 	public void TryWebLogin () {
-+            try {
- 		frob = flickr.AuthGetFrob ();
- 		string login_url = flickr.AuthCalcUrl (frob, FlickrNet.AuthLevel.Write);
- 
- 		GtkBeans.Global.ShowUri (null, login_url);
-+            } catch (Exception e) {
-+                Console.WriteLine("{0} Exception caught.",e);
-+	       HigMessageDialog md = new HigMessageDialog (null,Gtk.DialogFlags.Modal |Gtk.DialogFlags.DestroyWithParent,Gtk.MessageType.Error, Gtk.ButtonsType.Ok,Mono.Unix.Catalog.GetString ("Error reading server response"),String.Format (Mono.Unix.Catalog.GetString("The following error was encountered while attempting to log in: {0}"), e.Message));
-+	       md.Run();     
-+	       md.Destroy();
-+            }
- 	}
- 
- 	public class Service {

-- 
f-spot