f-spot r3553 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed Jan 16 19:04:50 2008
New Revision: 3553
URL: http://svn.gnome.org/viewvc/f-spot?rev=3553&view=rev

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

	* src/Makefile.am:
	* src/UntaggedCondition.cs: renamed from Untagged.cs

	* src/PhotoQuery.cs:
	* src/PhotoStore.cs: drop QueryUntagged in favor of Query (
	UntaggedCondition, ...)


Added:
   trunk/src/UntaggedCondition.cs
      - copied, changed from r3551, /trunk/src/Untagged.cs
Removed:
   trunk/src/Untagged.cs
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/PhotoQuery.cs
   trunk/src/PhotoStore.cs

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Jan 16 19:04:50 2008
@@ -206,7 +206,7 @@
 	$(srcdir)/TimeDialog.cs			\
 	$(srcdir)/TipWindow.cs			\
 	$(srcdir)/Unix.cs			\
-	$(srcdir)/Untagged.cs			\
+	$(srcdir)/UntaggedCondition.cs		\
 	$(srcdir)/Updater.cs			\
 	$(srcdir)/UriCollection.cs		\
 	$(srcdir)/Utils/ScreenSaver.cs		\

Modified: trunk/src/PhotoQuery.cs
==============================================================================
--- trunk/src/PhotoQuery.cs	(original)
+++ trunk/src/PhotoQuery.cs	Wed Jan 16 19:04:50 2008
@@ -162,7 +162,7 @@
 		public void RequestReload ()
 		{
 			if (untagged)
-				photos = store.QueryUntagged (range, roll_set, ratingrange);
+				photos = store.QueryUntagged (new UntaggedCondition (), range, roll_set, ratingrange);
 			else
 				photos = store.Query (terms, extra_condition, range, roll_set, ratingrange);
 

Modified: trunk/src/PhotoStore.cs
==============================================================================
--- trunk/src/PhotoStore.cs	(original)
+++ trunk/src/PhotoStore.cs	Wed Jan 16 19:04:50 2008
@@ -1200,16 +1200,6 @@
 		return Query (query_builder.ToString ());
 	}
 
-	public Photo [] Query (IQueryCondition condition, params IQueryCondition [] conditions)
-	{
-		IQueryCondition [] conds = new IQueryCondition [conditions.Length + 1];
-		conds [0] = condition;
-		for (int i=0; i < conditions.Length; i++)
-			conds [i + 1] = conditions [i];
-		return Query (conds);
-	}
-
-
 	public Photo [] Query (string query)
 	{
 		SqliteDataReader reader = Database.Query(query);
@@ -1278,12 +1268,6 @@
 	}
 
 	[Obsolete ("drop this, use IQueryCondition correctly instead")]
-	public Photo [] QueryUntagged (params IQueryCondition [] conditions)
-	{
-		return Query (new Untagged (), conditions);
-	}
-
-	[Obsolete ("drop this, use IQueryCondition correctly instead")]
 	public Photo [] Query (Tag [] tags, string extra_condition, DateRange range, RollSet importidrange)
 	{
 		return Query (OrTerm.FromTags(tags), extra_condition, range, importidrange, null);

Copied: trunk/src/UntaggedCondition.cs (from r3551, /trunk/src/Untagged.cs)
==============================================================================
--- /trunk/src/Untagged.cs	(original)
+++ trunk/src/UntaggedCondition.cs	Wed Jan 16 19:04:50 2008
@@ -1,5 +1,5 @@
 /*
- * Untagged.cs
+ * UntaggedCondition.cs
  * 
  * Author(s)
  *	Stephane Delcroix  <stephane delcroix org>
@@ -9,7 +9,7 @@
 
 namespace FSpot
 {
-	public class Untagged : IQueryCondition
+	public class UntaggedCondition : IQueryCondition
 	{
 		public string SqlClause ()
 		{