banshee r3079 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Sources

[gburt svn gnome org]

Author: gburt
Date: Tue Jan 29 03:52:45 2008
New Revision: 3079
URL: http://svn.gnome.org/viewvc/banshee?rev=3079&view=rev

Log:
2008-01-28  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:
	* src/Core/Banshee.Services/Banshee.Sources/Source.cs: Fix brokenness of
	confusing Count/Unfiltered count issue; unfortunately no less confusing
	though.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs	Tue Jan 29 03:52:45 2008
@@ -64,11 +64,11 @@
 #region Public Properties
 
         public override int Count {
-            get { return track_model.Count; }
+            get { return track_model is IFilterable ? ((IFilterable)track_model).UnfilteredCount : track_model.Count; }
         }
 
-        public override int UnfilteredCount {
-            get { return track_model.UnfilteredCount; }
+        public override int FilteredCount {
+            get { return track_model.Count; }
         }
 
         public TimeSpan Duration {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs	Tue Jan 29 03:52:45 2008
@@ -291,13 +291,13 @@
         }
         
         public abstract int Count { get; }
-        public virtual int UnfilteredCount { get { return Count; } }
+        public virtual int FilteredCount { get { return Count; } }
 
         public virtual string GetStatusText ()
         {
             StringBuilder builder = new StringBuilder ();
 
-            int count = Count;
+            int count = FilteredCount;
             builder.AppendFormat (Catalog.GetPluralString ("{0} Item", "{0} Items", count), count);
             
             if (this is IDurationAggregator) {