f-spot r4742 - in trunk: . src/Core

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed Mar 18 14:14:24 2009
New Revision: 4742
URL: http://svn.gnome.org/viewvc/f-spot?rev=4742&view=rev

Log:
clean old gio-sharp.dll on install. Patch from grendel

Modified:
   trunk/Makefile.am
   trunk/src/Core/Photo.cs

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Mar 18 14:14:24 2009
@@ -90,6 +90,9 @@
 
 install-data-hook: 
 	$(UPDATE_DESKTOP)
+	if [ -f $(DESTDIR)$(pkglibdir)/gio-sharp.dll ] ; then \
+		rm -f $(DESTDIR)$(pkglibdir)/gio-sharp.dll* ; \
+	fi
 
 uninstall-hook: 
 	$(UPDATE_DESKTOP)

Modified: trunk/src/Core/Photo.cs
==============================================================================
--- trunk/src/Core/Photo.cs	(original)
+++ trunk/src/Core/Photo.cs	Wed Mar 18 14:14:24 2009
@@ -418,19 +418,26 @@
 				}
 			} while (version_id > OriginalVersionId);
 		}
+
 		public uint CreateProtectedVersion (string name, uint base_version_id, bool create)
 		{
-			return CreateVersion (name, base_version_id, create, true);
+			return CreateVersion (name, null, base_version_id, create, true);
 		}
 	
 		public uint CreateVersion (string name, uint base_version_id, bool create)
 		{
-			return CreateVersion (name, base_version_id, create, false);
+			return CreateVersion (name, null, base_version_id, create, false);
+		}
+
+		public uint CreateVersion (string name, string extension, uint base_version_id, bool create)
+		{
+			return CreateVersion (name, extension, base_version_id, create, false);
 		}
 	
-		private uint CreateVersion (string name, uint base_version_id, bool create, bool is_protected)
+		private uint CreateVersion (string name, string extension, uint base_version_id, bool create, bool is_protected)
 		{
-			System.Uri new_uri = GetUriForVersionName (name, System.IO.Path.GetExtension (VersionUri (base_version_id).AbsolutePath));
+			extension = extension ?? System.IO.Path.GetExtension (VersionUri (base_version_id).AbsolutePath);
+			System.Uri new_uri = GetUriForVersionName (name, extension);
 			System.Uri original_uri = VersionUri (base_version_id);
 			string md5_sum = MD5Sum;