banshee r4653 - in trunk/banshee: . src/Clients/Nereid/Nereid src/Core/Banshee.Core/Banshee.Collection

[gburt svn gnome org]

Author: gburt
Date: Sun Oct  5 21:23:43 2008
New Revision: 4653
URL: http://svn.gnome.org/viewvc/banshee?rev=4653&view=rev

Log:
2008-10-05  Gabriel Burt  <gabriel burt gmail com>

	* src/Clients/Nereid/Nereid/ViewContainer.cs: Change "All Columns" in the
	search menu to "Artist, Album, or Title" since it does in fact only search
	those columns, not all of them (BGO #555122).

	* src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs: Apply the same
	fix as before, suggested by Benoit Boissinot, if the disc_count is zero,
	don't do the trick where we return the DiscNumber



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Nereid/Nereid/ViewContainer.cs
   trunk/banshee/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs

Modified: trunk/banshee/src/Clients/Nereid/Nereid/ViewContainer.cs
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid/ViewContainer.cs	(original)
+++ trunk/banshee/src/Clients/Nereid/Nereid/ViewContainer.cs	Sun Oct  5 21:23:43 2008
@@ -135,7 +135,7 @@
         
         private void BuildSearchEntry ()
         {
-            AddSearchFilter (TrackFilterType.None, String.Empty, Catalog.GetString ("All Columns"));
+            AddSearchFilter (TrackFilterType.None, String.Empty, Catalog.GetString ("Artist, Album, or Title"));
             AddSearchFilter (TrackFilterType.SongName, "title", Catalog.GetString ("Track Title"));
             AddSearchFilter (TrackFilterType.ArtistName, "artist", Catalog.GetString ("Artist Name"));
             AddSearchFilter (TrackFilterType.AlbumTitle, "album", Catalog.GetString ("Album Title"));

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs	Sun Oct  5 21:23:43 2008
@@ -304,7 +304,7 @@
         
         [Exportable]
         public virtual int DiscCount {
-            get { return DiscNumber > disc_count ? DiscNumber : disc_count; }
+            get { return (disc_count != 0 && disc_count < DiscNumber) ? DiscNumber : disc_count; }
             set { disc_count = value; }
         }