f-spot r4090 - trunk/extensions/GalleryExport

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue Jun 24 19:03:22 2008
New Revision: 4090
URL: http://svn.gnome.org/viewvc/f-spot?rev=4090&view=rev

Log:
workaround for ExpectContinue error with lighttpd. Enable it by setting the gconf key /apps/f-spot/export/gallery/lighttpd_workaround to true


Modified:
   trunk/extensions/GalleryExport/GalleryExport.addin.xml
   trunk/extensions/GalleryExport/GalleryExport.cs
   trunk/extensions/GalleryExport/GalleryRemote.cs

Modified: trunk/extensions/GalleryExport/GalleryExport.addin.xml
==============================================================================
--- trunk/extensions/GalleryExport/GalleryExport.addin.xml	(original)
+++ trunk/extensions/GalleryExport/GalleryExport.addin.xml	Tue Jun 24 19:03:22 2008
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.4.4.0"
+	version="0.4.4.1"
 	name="Gallery Export"
 	description="This extension allows you to export your photos to PHP Gallery (http://gallery.menalto.com)."
 	author="F-Spot team"

Modified: trunk/extensions/GalleryExport/GalleryExport.cs
==============================================================================
--- trunk/extensions/GalleryExport/GalleryExport.cs	(original)
+++ trunk/extensions/GalleryExport/GalleryExport.cs	Tue Jun 24 19:03:22 2008
@@ -33,10 +33,12 @@
 			}
 		}
 
+		public const string EXPORT_SERVICE = "gallery/";
+		public const string LIGHTTPD_WORKAROUND_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "lighttpd_workaround";
+
 		public Gallery Connect ()
 		{
-			//System.Console.WriteLine ("GalleryAccount.Connect()");
-			
+			//System.Console.WriteLine ("GalleryAccount.Connect()");	
 			Gallery gal = null;
 
 			if (version == GalleryVersion.VersionUnknown)
@@ -56,6 +58,10 @@
 
 			gallery = gal;
 			connected = true;
+			
+			object val = Preferences.Get (LIGHTTPD_WORKAROUND_KEY);
+			if (val != null)
+				gallery.expect_continue = !(bool)val;
 
 			return gallery;
 		}
@@ -641,14 +647,15 @@
 			LoadPreference (META_KEY);
 			LoadPreference (ROTATE_KEY);
 		}
-		
+
 		public const string EXPORT_SERVICE = "gallery/";
 		public const string SCALE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "scale";
 		public const string SIZE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "size";
 		public const string BROWSER_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "browser";
 		public const string META_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "meta";
 		public const string ROTATE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "rotate";
-
+		public const string LIGHTTPD_WORKAROUND_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "lighttpd_workaround";
+	
 		private bool scale;
 		private bool rotate;
 		private int size;

Modified: trunk/extensions/GalleryExport/GalleryRemote.cs
==============================================================================
--- trunk/extensions/GalleryExport/GalleryRemote.cs	(original)
+++ trunk/extensions/GalleryExport/GalleryRemote.cs	Tue Jun 24 19:03:22 2008
@@ -277,6 +277,8 @@
 			}
 		}
 
+		public bool expect_continue = true;
+
 		protected CookieContainer cookies = null;
 		public FSpot.ProgressItem Progress = null;
 
@@ -759,7 +761,8 @@
 			client.Add ("force_filename", filename);
 			client.Add ("auto_rotate", autorotate ? "yes" : "no");
 			client.Add ("userfile", new FileInfo (path));
-			
+			client.expect_continue = expect_continue;
+
 			return ParseAddItem (client.Submit (uri, Progress));
 		}
 		
@@ -975,6 +978,7 @@
 			client.Add ("g2_form[force_filename]", filename);
 			client.Add ("g2_form[auto_rotate]", autorotate ? "yes" : "no");
 			client.Add ("g2_userfile", new FileInfo (path));
+			client.expect_continue = expect_continue;
 			AddG2Specific (client);
 			
 			return ParseAddItem (client.Submit (uri, Progress));