f-spot r4053 - in trunk/extensions: . FolderExport

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Jun  9 06:12:36 2008
New Revision: 4053
URL: http://svn.gnome.org/viewvc/f-spot?rev=4053&view=rev

Log:
2008-06-09  Stephane Delcroix  <sdelcroix novell com>

	* FolderExport/: Fix exception on missing gconf key for original.
	bgo #537331.




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

Modified: trunk/extensions/FolderExport/FolderExport.addin.xml
==============================================================================
--- trunk/extensions/FolderExport/FolderExport.addin.xml	(original)
+++ trunk/extensions/FolderExport/FolderExport.addin.xml	Mon Jun  9 06:12:36 2008
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.4.4.1"
+	version="0.4.4.2"
 	name="Folder Export"
 	description="This extension allows you to export your photos to HTML galleries, Original galleries or just to a folder."
 	author="F-Spot team"

Modified: trunk/extensions/FolderExport/FolderExport.cs
==============================================================================
--- trunk/extensions/FolderExport/FolderExport.cs	(original)
+++ trunk/extensions/FolderExport/FolderExport.cs	Mon Jun  9 06:12:36 2008
@@ -229,8 +229,17 @@
 				}
 
 				//create the zip tarballs for original
-				if (gallery is OriginalGallery && (bool)Preferences.Get(INCLUDE_TARBALLS_KEY))
-					(gallery as OriginalGallery).CreateZip ();
+				if (gallery is OriginalGallery) {
+					bool include_tarballs;
+					try {
+						include_tarballs = (bool)Preferences.Get (INCLUDE_TARBALLS_KEY);
+					} catch (NullReferenceException){
+						include_tarballs = true;
+						Preferences.Set (INCLUDE_TARBALLS_KEY, true);
+					}
+					if (include_tarballs)
+						(gallery as OriginalGallery).CreateZip ();
+				}
 
 				// we've created the structure, now if the destination was local we are done
 				// otherwise we xfer