f-spot r3725 - in trunk: . src src/Imaging

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Sat Mar  1 08:40:12 2008
New Revision: 3725
URL: http://svn.gnome.org/viewvc/f-spot?rev=3725&view=rev

Log:
2008-03-01  Stephane Delcroix  <sdelcroix novell com>

	* src/RotateCommand.cs:
	* src/Makefile.am:
	* src/Unix.cs:
	* src/Imaging/PngFile.cs:
	* src/Imaging/JpegFile.cs: moving the Unix class in the Utils namespace
	and assembly.


Modified:
   trunk/ChangeLog
   trunk/src/Imaging/JpegFile.cs
   trunk/src/Imaging/PngFile.cs
   trunk/src/Makefile.am
   trunk/src/RotateCommand.cs
   trunk/src/Unix.cs

Modified: trunk/src/Imaging/JpegFile.cs
==============================================================================
--- trunk/src/Imaging/JpegFile.cs	(original)
+++ trunk/src/Imaging/JpegFile.cs	Sat Mar  1 08:40:12 2008
@@ -148,14 +148,14 @@
 
 			string  temp_path = path;
 			using (System.IO.FileStream stream = System.IO.File.OpenRead (path)) {
-				using (System.IO.Stream output = FSpot.Unix.MakeSafeTemp (ref temp_path)) {
+				using (System.IO.Stream output = FSpot.Utils.Unix.MakeSafeTemp (ref temp_path)) {
 					SaveMetaData (stream, output);
 				}
 			}
 
 			File.SetAttributes (temp_path, File.GetAttributes (path));
 
-			if (FSpot.Unix.Rename (temp_path, path) < 0) {
+			if (FSpot.Utils.Unix.Rename (temp_path, path) < 0) {
 				System.IO.File.Delete (temp_path);
 				throw new System.Exception (System.String.Format ("Unable to rename {0} to {1}",
 										  temp_path, path));

Modified: trunk/src/Imaging/PngFile.cs
==============================================================================
--- trunk/src/Imaging/PngFile.cs	(original)
+++ trunk/src/Imaging/PngFile.cs	Sat Mar  1 08:40:12 2008
@@ -1277,7 +1277,7 @@
 			using (System.IO.Stream output = System.IO.File.OpenWrite (temp_path)) {
 				Save (output);
 			}
-			if (FSpot.Unix.Rename (temp_path, path) < 0) {
+			if (FSpot.Utils.Unix.Rename (temp_path, path) < 0) {
 				System.IO.File.Delete (temp_path);
 				throw new System.Exception (System.String.Format ("Unable to rename {0} to {1}", temp_path, path));
 			}

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Mar  1 08:40:12 2008
@@ -28,6 +28,7 @@
 	$(srcdir)/Utils/DbUtils.cs		\
 	$(srcdir)/Utils/GnomeUtil.cs		\
 	$(srcdir)/Utils/GtkUtil.cs		\
+	$(srcdir)/Unix.cs			\
 	$(srcdir)/Utils/UriUtils.cs		\
 	$(srcdir)/Utils/ScreenSaver.cs
 
@@ -225,7 +226,6 @@
 	$(srcdir)/UI.Dialog/AboutDialog.cs	\
 	$(srcdir)/UI.Dialog/EditExceptionDialog.cs	\
 	$(srcdir)/UI.Dialog/HigMessageDialog.cs	\
-	$(srcdir)/Unix.cs			\
 	$(srcdir)/Updater.cs			\
 	$(srcdir)/UriCollection.cs		\
 	$(srcdir)/Util.cs			\

Modified: trunk/src/RotateCommand.cs
==============================================================================
--- trunk/src/RotateCommand.cs	(original)
+++ trunk/src/RotateCommand.cs	Sat Mar  1 08:40:12 2008
@@ -63,7 +63,7 @@
 					     direction == RotateDirection.Clockwise ? JpegUtils.TransformType.Rotate90 
 					     : JpegUtils.TransformType.Rotate270);
 			
-			Unix.Rename (temporary_path, original_path);
+			Utils.Unix.Rename (temporary_path, original_path);
 		}
 
 		private static void RotateOrientation (string original_path, RotateDirection direction)

Modified: trunk/src/Unix.cs
==============================================================================
--- trunk/src/Unix.cs	(original)
+++ trunk/src/Unix.cs	Sat Mar  1 08:40:12 2008
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
-namespace FSpot {
-	class Unix {
+namespace FSpot.Utils {
+	public class Unix {
 
 		[DllImport ("libc")]
 		static extern int rename (string oldpath, string newpath);