[f-spot: 3/3] merge tigger's remove_obsolete branch

[Stephane Delcroix <sdelcroix src gnome org>]

commit c0385987abbb0f77ab8298a375924dae451d3eee
Merge: 34138a1... 3c05d46...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Mon Jul 6 11:24:15 2009 +0200

    merge tigger's remove_obsolete branch

 extensions/Exporters/FlickrExport/FlickrExport.cs  |   63 ++++++++--------
 extensions/Exporters/FolderExport/FolderExport.cs  |   43 +++++------
 .../Exporters/GalleryExport/GalleryExport.cs       |   30 +++-----
 .../Exporters/PicasaWebExport/PicasaWebExport.cs   |   25 +++----
 .../Exporters/SmugMugExport/SmugMugExport.cs       |   23 ++----
 extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs  |   13 +---
 extensions/Tools/MergeDb/MergeDb.cs                |    4 +-
 src/Core/Photo.cs                                  |    8 +-
 src/FileImportBackend.cs                           |    7 +-
 src/Loupe.cs                                       |   11 +---
 src/MainWindow.cs                                  |   15 +---
 src/PhotoLoader.cs                                 |    7 --
 src/PhotoStore.cs                                  |   41 +----------
 src/Preferences.cs                                 |   19 -----
 src/RotateCommand.cs                               |    2 +-
 src/ThumbnailGenerator.cs                          |    6 --
 src/Utils/Log.cs                                   |   79 ++++++--------------
 17 files changed, 120 insertions(+), 276 deletions(-)
---
diff --cc src/PhotoStore.cs
index 1b9bf9f,25b7da6..03a66ae
--- a/src/PhotoStore.cs
+++ b/src/PhotoStore.cs
@@@ -916,47 -888,9 +898,28 @@@ public class PhotoStore : DbStore<Photo
  		return query_result.ToArray ();
  	}
  
- //	[Obsolete ("No longer make any sense with uris...")]
- //	public Photo [] Query (System.IO.DirectoryInfo dir)
- //	{
- //		return Query (new DbCommand (
- //			"SELECT photos.id, "			+
- //				"photos.time, "			+
- //				"photos.uri, "			+
- //				"photos.description, "		+
- //				"photos.roll_id, "		+
- //				"photos.default_version_id, "	+
- //				"photos.rating "		+
- //			"FROM photos " 				+
- //			"WHERE uri LIKE \"file://:dir%\" "	+
- //			"AND uri NOT LIKE \"file://:dir/%/%\"",
- //			"dir", dir.FullName ));
- //	}
- 
  	public Photo [] Query (System.Uri uri)
  	{
- 		Log.DebugFormat ("Query Uri {0}", uri);
- 		
 -		Log.Debug ("Query Uri {0}", uri);
 +		/* query by file */
 +		if (uri.IsFile) {
 +			return Query (new DbCommand (
 +			"SELECT id, "			+
 +				"time, "			+
 +				"base_uri, "		+
 +				"filename, "		+
 +				"description, "		+
 +				"roll_id, "		+
 +				"default_version_id, "	+
 +				"rating, "		+
 +				"md5_sum "		+
 +			"FROM photos " 				+
 +			"WHERE base_uri LIKE :base_uri "		+
 +			"AND filename LIKE :filename",
 +			"base_uri", uri.GetDirectoryUri ().ToString (),
 +			"filename", uri.GetFilename ()));
 +		}
 +		
 +		/* query by directory */
  		return Query (new DbCommand (
  			"SELECT id, "			+
  				"time, "			+