f-spot r4703 - in trunk: . src

[lmilesi svn gnome org]

Author: lmilesi
Date: Tue Feb 10 09:04:26 2009
New Revision: 4703
URL: http://svn.gnome.org/viewvc/f-spot?rev=4703&view=rev

Log:
2009-02-10  Lorenzo Milesi  <maxxer yetopen it>

	* src/PhotoVersionCommands.cs: remove commit of the old photo, 
	  remove S.C.WL.
	* src/MainWindow.cs: avoid reparenting self.


Modified:
   trunk/ChangeLog
   trunk/src/MainWindow.cs
   trunk/src/PhotoVersionCommands.cs

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Tue Feb 10 09:04:26 2009
@@ -1399,8 +1399,9 @@
 			int p_item = icon_view.CellAtPosition (args.X + (int) icon_view.Hadjustment.Value, 
 							     args.Y + (int) icon_view.Vadjustment.Value);
 
-			if (p_item >= 0)
-			{
+			if (p_item >= 0) {
+				if (icon_view.Selection.Contains (p_item)) //We don't want to reparent ourselves!
+					return;
 				PhotoVersionCommands.Reparent cmd = new PhotoVersionCommands.Reparent ();
 				
 				cmd.Execute (db.Photos, SelectedPhotos(), query.Photos [p_item], GetToplevel (null));

Modified: trunk/src/PhotoVersionCommands.cs
==============================================================================
--- trunk/src/PhotoVersionCommands.cs	(original)
+++ trunk/src/PhotoVersionCommands.cs	Tue Feb 10 09:04:26 2009
@@ -221,7 +221,7 @@
 						new_parent.DefaultVersionId = new_parent.CreateReparentedVersion (photo.GetVersion (version_id) as PhotoVersion);
 						store.Commit (new_parent);
 					} catch (Exception e) {
-						Console.WriteLine (e);	
+						Log.DebugException (e);	
 					}
 				}
 				uint [] version_ids = photo.VersionIds;
@@ -230,10 +230,9 @@
 					try {
 						photo.DeleteVersion (version_id, true, true);
 					} catch (Exception e) {
-						Console.WriteLine(e);
+						Log.DebugException (e);
 					}
 				}
-				store.Commit (photo);
 				MainWindow.Toplevel.Database.Photos.Remove (photo);
 			}
 			return true;