banshee r3439 - in trunk/banshee: . src/Core/Banshee.Core/Banshee.Base src/Core/Banshee.Services src/Core/Banshee.ThickClient/Banshee.Collection.Gui

[abock svn gnome org]

Author: abock
Date: Thu Mar 13 03:16:53 2008
New Revision: 3439
URL: http://svn.gnome.org/viewvc/banshee?rev=3439&view=rev

Log:
2008-03-12  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.Core/Banshee.Base/Paths.cs: Redefine 
    LegacyApplicationData to mean the previous ApplicationData, not the
    one from when we were using ~/.gnome2/banshee

    * src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs:
    Migrate cover art from the new LegacyApplicationData path

    * src/Core/Banshee.Services/Makefile.am: Fixed build



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Paths.cs
   trunk/banshee/src/Core/Banshee.Services/Makefile.am
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Paths.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Paths.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Paths.cs	Thu Mar 13 03:16:53 2008
@@ -114,16 +114,12 @@
                 ? path.Substring (library_location.Length + 1)
                 : null;
         }
+        
+        private static string legacy_application_data = Path.Combine (Environment.GetFolderPath (
+            Environment.SpecialFolder.ApplicationData), "banshee");
     
         public static string LegacyApplicationData {
-            get {
-                return Environment.GetFolderPath (Environment.SpecialFolder.Personal)
-                    + Path.DirectorySeparatorChar
-                    + ".gnome2"
-                    + Path.DirectorySeparatorChar
-                    + "banshee"
-                    + Path.DirectorySeparatorChar;
-            }
+            get { return legacy_application_data; }
         }
         
         private static string application_data = Path.Combine (Environment.GetFolderPath (

Modified: trunk/banshee/src/Core/Banshee.Services/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Makefile.am	Thu Mar 13 03:16:53 2008
@@ -12,8 +12,8 @@
 	Banshee.Base/ThreadAssist.cs \
 	Banshee.Collection.Database/AlbumListDatabaseModel.cs \
 	Banshee.Collection.Database/ArtistListDatabaseModel.cs \
+	Banshee.Collection.Database/DatabaseAlbumInfo.cs \
 	Banshee.Collection.Database/DatabaseTrackInfo.cs \
-	Banshee.Collection.Database/LibraryAlbumInfo.cs \
 	Banshee.Collection.Database/LibraryArtistInfo.cs \
 	Banshee.Collection.Database/TrackListDatabaseModel.cs \
 	Banshee.Collection/AlbumListModel.cs \

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs	Thu Mar 13 03:16:53 2008
@@ -60,7 +60,7 @@
             
             // FIXME: Replace with Directory.Move for release
             
-            string legacy_artwork_path = Path.Combine (Paths.ApplicationData, "covers");
+            string legacy_artwork_path = Path.Combine (Paths.LegacyApplicationData, "covers");
             int artwork_count = 0;
             
             if (Directory.Exists (legacy_artwork_path)) {