[f-spot] replace InformationFormat and WarningFormat by Information and Warning

[Stephane Delcroix <sdelcroix src gnome org>]

commit b59ffde4c8c40ca338791ce8557225cbccb1ff25
Author: Stephane Delcroix <stephane delcroix org>
Date:   Tue Jun 23 12:03:32 2009 +0200

    replace InformationFormat and WarningFormat by Information and Warning

 .../Exporters/TabbloExport/TabbloExportModel.cs    |    2 +-
 extensions/Tools/MergeDb/MergeDb.cs                |    6 +++---
 src/Editors/CropEditor.cs                          |    2 +-
 src/ImageLoaderThread.cs                           |    2 +-
 src/main.cs                                        |   12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/extensions/Exporters/TabbloExport/TabbloExportModel.cs b/extensions/Exporters/TabbloExport/TabbloExportModel.cs
index c178d83..6c0eab7 100644
--- a/extensions/Exporters/TabbloExport/TabbloExportModel.cs
+++ b/extensions/Exporters/TabbloExport/TabbloExportModel.cs
@@ -270,7 +270,7 @@ namespace FSpotTabbloExport {
 						Gnome.Keyring.Ring.Find (
 								type, attrs);
 				if (1 < items.Length) {
-					Log.WarningFormat ("More than one {0} "
+					Log.Warning ("More than one {0} "
 							+ " found in keyring",
 							KeyringItemName);
 				}
diff --git a/extensions/Tools/MergeDb/MergeDb.cs b/extensions/Tools/MergeDb/MergeDb.cs
index da4b90d..3f0d606 100644
--- a/extensions/Tools/MergeDb/MergeDb.cs
+++ b/extensions/Tools/MergeDb/MergeDb.cs
@@ -109,7 +109,7 @@ namespace MergeDbExtension
 
 		public static void Merge (string path, Db to_db)
 		{
-			Log.WarningFormat ("Will merge db {0} into main f-spot db {1}", path, FSpot.Global.BaseDirectory + "/photos.db" );
+			Log.Warning ("Will merge db {0} into main f-spot db {1}", path, FSpot.Global.BaseDirectory + "/photos.db" );
 			Db from_db = new Db ();
 			from_db.Init (path, true);
 			//MergeDb mdb = new MergeDb (from_db, to_db);
@@ -187,7 +187,7 @@ namespace MergeDbExtension
 
 		void ImportPhoto (Photo photo, bool copy)
 		{
-			Log.WarningFormat ("Importing {0}", photo.Name);
+			Log.Warning ("Importing {0}", photo.Name);
 			PhotoStore from_store = from_db.Photos;
 			PhotoStore to_store = to_db.Photos;
 
@@ -259,7 +259,7 @@ namespace MergeDbExtension
 				return;
 
 			foreach (Tag t in photo.Tags) {
-				Log.WarningFormat ("Tagging with {0}", t.Name);
+				Log.Warning ("Tagging with {0}", t.Name);
 				newp.AddTag (tag_map [t.Id]);
 			}
 
diff --git a/src/Editors/CropEditor.cs b/src/Editors/CropEditor.cs
index ac6283c..9171b47 100644
--- a/src/Editors/CropEditor.cs
+++ b/src/Editors/CropEditor.cs
@@ -143,7 +143,7 @@ namespace FSpot.Editors {
 						Pixbuf pb = State.PhotoImageView.CompletePixbuf ();
 						State.PhotoImageView.SelectionXyRatio = (double)pb.Width / (double)pb.Height;
 					} catch (System.Exception ex) {
-						Log.WarningFormat ("Exception in selection ratio's: {0}", ex);
+						Log.Warning ("Exception in selection ratio's: {0}", ex);
 						State.PhotoImageView.SelectionXyRatio = 0;
 					}
 					break;
diff --git a/src/ImageLoaderThread.cs b/src/ImageLoaderThread.cs
index 9e3ccda..148c7da 100644
--- a/src/ImageLoaderThread.cs
+++ b/src/ImageLoaderThread.cs
@@ -182,7 +182,7 @@ public class ImageLoaderThread {
 		if (requests_by_uri.TryGetValue (uri, out existing_request)) {
 			/* FIXME: At least for now, this shouldn't happen.  */
 			if (existing_request.order != order)
-				Log.WarningFormat ("BUG: Filing another request of order {0} (previously {1}) for `{2}'",
+				Log.Warning ("BUG: Filing another request of order {0} (previously {1}) for `{2}'",
 						   order, existing_request.order, uri);
 
 			queue.Remove (existing_request);
diff --git a/src/main.cs b/src/main.cs
index 5ed43ea..be9c736 100644
--- a/src/main.cs
+++ b/src/main.cs
@@ -87,7 +87,7 @@ namespace FSpot
 						return 1;
 					}
 					FSpot.Global.BaseDirectory = args [++i];
-					Log.InformationFormat ("BaseDirectory is now {0}", FSpot.Global.BaseDirectory);
+					Log.Information ("BaseDirectory is now {0}", FSpot.Global.BaseDirectory);
 					break;
 
 				case "-p": case "-photodir": case "--photodir":
@@ -96,7 +96,7 @@ namespace FSpot
 						return 1;
 					}
 					FSpot.Global.PhotoDirectory = System.IO.Path.GetFullPath (args [++i]);
-					Log.InformationFormat ("PhotoDirectory is now {0}", FSpot.Global.PhotoDirectory);
+					Log.Information ("PhotoDirectory is now {0}", FSpot.Global.PhotoDirectory);
 					break;
 
 				case "-i": case "-import": case "--import":
@@ -200,7 +200,7 @@ namespace FSpot
 				string maj_version = String.Join (".", Defines.VERSION.Split ('.'), 0, 3);
 				foreach (AddinRepository repo in setupService.Repositories.GetRepositories ())
 					if (repo.Url.StartsWith ("http://addins.f-spot.org/";) && !repo.Url.StartsWith ("http://addins.f-spot.org/"; + maj_version)) {
-						Log.InformationFormat ("Unregistering {0}", repo.Url);
+						Log.Information ("Unregistering {0}", repo.Url);
 						setupService.Repositories.RemoveRepository (repo.Url);
 					}
 				setupService.Repositories.RegisterRepository (null, "http://addins.f-spot.org/"; + maj_version, false);
@@ -216,9 +216,9 @@ namespace FSpot
 
 				if (control == null) {
 					if (!shutdown)
-						Log.InformationFormat ("Starting new FSpot server (f-spot {0})", FSpot.Defines.VERSION);
+						Log.Information ("Starting new FSpot server (f-spot {0})", FSpot.Defines.VERSION);
 				} else
-					Log.InformationFormat ("Found active FSpot server: {0}", control);
+					Log.Information ("Found active FSpot server: {0}", control);
 
 				Core core = null;
 				try {
@@ -300,7 +300,7 @@ namespace FSpot
 							service.Initialize ();
 							service.Start ();
 						} catch (Exception e) {
-							Log.WarningFormat ("Something went wrong while starting the {0} extension.", service.Id);
+							Log.Warning ("Something went wrong while starting the {0} extension.", service.Id);
 							Log.DebugException (e);
 						}
 					}