Index: plugins/banshee/BansheePlugin.cs
===================================================================
--- plugins/banshee/BansheePlugin.cs	(revision 240)
+++ plugins/banshee/BansheePlugin.cs	(working copy)
@@ -29,7 +29,7 @@
             playlists = new Dictionary<int, Playlist> ();
             
             dbpath = Path.Combine (Environment.GetEnvironmentVariable ("HOME"),
-                                   ".gnome2/banshee/banshee.db");
+                                   ".config/banshee-1/banshee.db");
             bansheeDir = Path.GetDirectoryName (dbpath);
             
             if (Directory.Exists (bansheeDir)) {
@@ -77,8 +77,10 @@
                 return;
             
             IDbCommand cmd = conn.CreateCommand ();
-            cmd.CommandText = "SELECT TrackID, Uri, Artist, AlbumTitle, ReleaseDate, Title, Genre, Year, " +
-                "TrackNumber, TrackCount, Duration FROM Tracks";
+            cmd.CommandText = "SELECT CoreTracks.TrackID, CoreTracks.Uri, CoreArtists.Name, CoreAlbums.Title, CoreAlbums.ReleaseDate, " +
+                "CoreTracks.Title, CoreTracks.Genre, CoreTracks.Year, CoreTracks.TrackNumber, CoreTracks.TrackCount, CoreTracks.Duration " +
+                "FROM CoreTracks INNER JOIN CoreArtists, CoreAlbums " +
+                "WHERE CoreTracks.ArtistID=CoreArtists.ArtistID AND CoreTracks.AlbumID=CoreAlbums.AlbumID";
 
             List<int> ids = new List<int> ();
             
@@ -134,7 +136,7 @@
                 return;
             
             IDbCommand cmd = conn.CreateCommand ();
-            cmd.CommandText = "SELECT PlaylistID, Name FROM Playlists";
+            cmd.CommandText = "SELECT SmartPlaylistID, Name FROM CoreSmartPlaylists";
 
             List<int> ids = new List<int> ();
             
@@ -168,7 +170,7 @@
             }
 
             cmd = conn.CreateCommand ();
-            cmd.CommandText = "SELECT PlaylistID, TrackID FROM PlaylistEntries";
+            cmd.CommandText = "SELECT SmartPlaylistID, TrackID FROM CoreSmartPlaylistEntries";
             reader = cmd.ExecuteReader ();
 
             while (reader.Read ()) {