[f-spot: 15/16] Rebasing fixes

[Ruben Vermeersch <rubenv src gnome org>]

commit 119b00bb06146761a8b62e8715663a68200af163
Author: Anton Keks <anton azib net>
Date:   Fri May 21 01:22:08 2010 +0300

    Rebasing fixes

 src/Core/Photo.cs           |    2 +-
 src/MainWindow.cs           |    4 ++--
 src/PhotoVersionCommands.cs |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/Core/Photo.cs b/src/Core/Photo.cs
index aa5adf6..7d72e02 100644
--- a/src/Core/Photo.cs
+++ b/src/Core/Photo.cs
@@ -439,7 +439,7 @@ namespace FSpot
 	//		PhotoStore.MoveThumbnail (old_path, new_path);
 		}
 		
-		public void CopyAttributesFrom (PhotoVersion that) 
+		public void CopyAttributesFrom (Photo that) 
 		{			
 			Time = that.Time;
 			Description = that.Description;
diff --git a/src/MainWindow.cs b/src/MainWindow.cs
index 4d02469..a6fef16 100644
--- a/src/MainWindow.cs
+++ b/src/MainWindow.cs
@@ -1228,7 +1228,7 @@ namespace FSpot
 					Photo[] photos_to_reparent = SelectedPhotos ();
 					// Give feedback to user that something happened, and leave the parent selected after reparenting
 					icon_view.Selection.Add (p_item); 
-					cmd.Execute (db.Photos, photos_to_reparent, query.Photos [p_item], GetToplevel (null));
+					cmd.Execute (Database.Photos, photos_to_reparent, query.Photos [p_item], GetToplevel (null));
 					UpdateQuery ();
 				}
 				Gtk.Drag.Finish (args.Context, true, false, args.Time);
@@ -1716,7 +1716,7 @@ namespace FSpot
 		void HandleDetachVersionCommand (object obj, EventArgs args)
 		{
 			PhotoVersionCommands.Detach cmd = new PhotoVersionCommands.Detach ();
-			cmd.Execute (db.Photos, CurrentPhoto, GetToplevel (null));
+			cmd.Execute (Database.Photos, CurrentPhoto, GetToplevel (null));
 			UpdateQuery ();
 		}
 	
diff --git a/src/PhotoVersionCommands.cs b/src/PhotoVersionCommands.cs
index 322e507..86de2b2 100644
--- a/src/PhotoVersionCommands.cs
+++ b/src/PhotoVersionCommands.cs
@@ -173,9 +173,9 @@ public class PhotoVersionCommands
 			try {
 				if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(parent_window, DialogFlags.DestroyWithParent, 
 									   MessageType.Warning, msg, desc, ok_caption)) {
-					Gdk.Pixbuf thumbnail = null;
-					Photo new_photo = store.Create (photo.DefaultVersionUri, photo.RollId, out thumbnail);
-					new_photo.CopyAttributesFrom (photo.DefaultVersion);
+					Photo new_photo = store.Create (photo.DefaultVersion.Uri, photo.RollId);
+					new_photo.CopyAttributesFrom (photo);
+					new_photo.MD5Sum = (photo.DefaultVersion as PhotoVersion).MD5Sum;
 					photo.DeleteVersion (photo.DefaultVersionId, false, true);
 					store.Commit (new Photo[] {new_photo, photo});
 					return true;