[f-spot] some style fixes

[Stephane Delcroix <sdelcroix src gnome org>]

commit 166c6568d8ffbcf07bd6d02ff61974297898811f
Author: Stephane Delcroix <stephane delcroix org>
Date:   Thu Jul 23 12:30:57 2009 +0200

    some style fixes

 src/FolderQueryWidget.cs |   12 +++---------
 src/Makefile.am          |    1 +
 src/PhotoQuery.cs        |   15 ---------------
 src/TagQueryWidget.cs    |    3 ++-
 src/Widgets/FindBar.cs   |    2 +-
 5 files changed, 7 insertions(+), 26 deletions(-)
---
diff --git a/src/FolderQueryWidget.cs b/src/FolderQueryWidget.cs
index 875ee96..3ce26c5 100644
--- a/src/FolderQueryWidget.cs
+++ b/src/FolderQueryWidget.cs
@@ -7,7 +7,6 @@
  * This is free software. See COPYING for details.
  */
 
-
 using System;
 using System.Text;
 using System.Collections;
@@ -22,14 +21,12 @@ using FSpot.Query;
 
 namespace FSpot
 {
-	
-	
 	public class FolderQueryWidget : HBox
 	{
 		PhotoQuery query;
 		FolderSet folder_set;
 		
-		public FolderQueryWidget ()
+		public FolderQueryWidget () : base ()
 		{
 			folder_set = new FolderSet ();
 			query = MainWindow.Toplevel.Query;
@@ -41,7 +38,7 @@ namespace FSpot
 			              Gdk.DragAction.Copy | Gdk.DragAction.Move);
 		}
 		
-		private void UpdateGui ()
+		void UpdateGui ()
 		{
 			while (Children.Length != 0)
 				Remove (Children[0]);
@@ -99,9 +96,7 @@ namespace FSpot
 		}
 		
 		public bool Empty {
-			get {
-				return folder_set.Folders == null || folder_set.Folders.Count () == 0;
-			}
+			get { return folder_set.Folders == null || folder_set.Folders.Count () == 0; }
 		}
 		
 		private static TargetEntry [] folder_query_widget_source_table =
@@ -116,6 +111,5 @@ namespace FSpot
 			SetFolders (selection_data.GetUriListData ());
 			query.RequestReload ();
 		}
-
 	}
 }
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f0848b..4215cf9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,6 +45,7 @@ QUERY_CSDISTFILES =				\
 	$(srcdir)/Query/OrderByTime.cs		\
 	$(srcdir)/Query/RatingRange.cs		\
 	$(srcdir)/Query/RollSet.cs		\
+	$(srcdir)/Query/TagConditionWrapper.cs	\
 	$(srcdir)/Query/UntaggedCondition.cs
 
 UTILS_CSDISTFILES =				\
diff --git a/src/PhotoQuery.cs b/src/PhotoQuery.cs
index 14bb69d..c2384ff 100644
--- a/src/PhotoQuery.cs
+++ b/src/PhotoQuery.cs
@@ -383,20 +383,5 @@ namespace FSpot {
 		{
 			ItemsChanged (this, new BrowsableEventArgs (indexes, changes));
 		}
-		
-		public class TagConditionWrapper : IQueryCondition
-		{
-			string condition;
-			
-			public TagConditionWrapper (string condition)
-			{
-				this.condition = condition;
-			}
-			
-			public string SqlClause ()
-			{
-				return condition;
-			}
-		}
 	}
 }
diff --git a/src/TagQueryWidget.cs b/src/TagQueryWidget.cs
index 009b3d2..6ddddb4 100644
--- a/src/TagQueryWidget.cs
+++ b/src/TagQueryWidget.cs
@@ -6,6 +6,7 @@ using Gtk;
 using Gdk;
 
 using FSpot.Utils;
+using FSpot.Query;
 
 namespace FSpot
 {
@@ -679,7 +680,7 @@ namespace FSpot
 				query.TagTerm = null;
 			} else {
 				help.Hide ();
-				query.TagTerm = new PhotoQuery.TagConditionWrapper (rootTerm.SqlCondition ());
+				query.TagTerm = new TagConditionWrapper (rootTerm.SqlCondition ());
 			}
 
 			EventHandler handler = Changed;
diff --git a/src/Widgets/FindBar.cs b/src/Widgets/FindBar.cs
index 3191ee8..c1b6cd3 100644
--- a/src/Widgets/FindBar.cs
+++ b/src/Widgets/FindBar.cs
@@ -410,7 +410,7 @@ namespace FSpot.Widgets {
 						root_term = root_parent;
 					}
 					//Log.Debug ("condition = {0}", RootTerm.SqlCondition ());
-					query.TagTerm = new PhotoQuery.TagConditionWrapper (RootTerm.SqlCondition ());
+					query.TagTerm = new TagConditionWrapper (RootTerm.SqlCondition ());
 				} else {
 					query.TagTerm = null;
 					//Log.Debug ("root term is null");