banshee r4417 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.Query

[blorentz svn gnome org]

Author: blorentz
Date: Fri Aug 22 18:36:37 2008
New Revision: 4417
URL: http://svn.gnome.org/viewvc/banshee?rev=4417&view=rev

Log:
2008-08-22  Bertrand Lorentz  <bertrand lorentz gmail com>

	* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs:
	* src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs: Fix a crash 
	caused by the DiscNumber property name change (BGO #548975).



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs	Fri Aug 22 18:36:37 2008
@@ -386,7 +386,7 @@
             set { base.TrackCount = value; }
         }
         
-        [DatabaseColumn]
+        [DatabaseColumn ("Disc")]
         public override int DiscNumber {
             get { return base.DiscNumber; }
             set { base.DiscNumber = value; }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs	Fri Aug 22 18:36:37 2008
@@ -106,7 +106,7 @@
         );
 
         public static QueryField DiscField = new QueryField (
-            "disc", "Disc",
+            "disc", "DiscNumber",
             Catalog.GetString ("Disc"), "CoreTracks.Disc", typeof(NaturalIntegerQueryValue),
             // Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
             Catalog.GetString ("disc"), Catalog.GetString ("cd"), Catalog.GetString ("discnum"),