f-spot r3770 - in trunk/extensions: . FlickrExport

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Fri Mar 21 08:37:48 2008
New Revision: 3770
URL: http://svn.gnome.org/viewvc/f-spot?rev=3770&view=rev

Log:
2008-03-21  Stephane Delcroix  <sdelcroix novell com>

	* FlickrExport/FlickExport.cs: fixing the ok/cancel button. bgo 
	#468817.
	* FlickExport/FlickrExport.addin.xml: bumping the version number.


Modified:
   trunk/extensions/ChangeLog
   trunk/extensions/FlickrExport/FlickrExport.addin.xml
   trunk/extensions/FlickrExport/FlickrExport.cs

Modified: trunk/extensions/FlickrExport/FlickrExport.addin.xml
==============================================================================
--- trunk/extensions/FlickrExport/FlickrExport.addin.xml	(original)
+++ trunk/extensions/FlickrExport/FlickrExport.addin.xml	Fri Mar 21 08:37:48 2008
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="1.2"
+	version="1.3"
 	name="Flickr Export"
 	description="This extension allows you to export your photos to Flickr and 23hq."
 	author="F-Spot team"

Modified: trunk/extensions/FlickrExport/FlickrExport.cs
==============================================================================
--- trunk/extensions/FlickrExport/FlickrExport.cs	(original)
+++ trunk/extensions/FlickrExport/FlickrExport.cs	Fri Mar 21 08:37:48 2008
@@ -332,10 +332,6 @@
 									      ExportStore.FlickrExportType,
 									      auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id);
                                         
-					progress_dialog.Message = Catalog.GetString ("Done Sending Photos");
-					progress_dialog.Fraction = 1.0;
-					progress_dialog.ProgressText = Catalog.GetString ("Upload Complete");
-					progress_dialog.ButtonLabel = Gtk.Stock.Ok;
 				} catch (System.Exception e) {
 					progress_dialog.Message = String.Format (Catalog.GetString ("Error Uploading To {0}: {1}"),
 										 current_service.Name,
@@ -349,6 +345,10 @@
 					}
 				}
 			}
+			progress_dialog.Message = Catalog.GetString ("Done Sending Photos");
+			progress_dialog.Fraction = 1.0;
+			progress_dialog.ProgressText = Catalog.GetString ("Upload Complete");
+			progress_dialog.ButtonLabel = Gtk.Stock.Ok;
 
 			if (open && ids.Count != 0) {
 				string view_url = string.Format ("http://www.{0}/tools/uploader_edit.gne?ids";, current_service.Name);