banshee r3382 - in trunk/banshee: . src/Clients/Nereid/Nereid src/Core/Banshee.Core/Resources src/Core/Banshee.Services/Banshee.Playlist src/Core/Banshee.Services/Banshee.Sources src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Libraries/Hyena/Hyena.Data.Sqlite

[gburt svn gnome org]

Author: gburt
Date: Wed Mar  5 16:37:51 2008
New Revision: 3382
URL: http://svn.gnome.org/viewvc/banshee?rev=3382&view=rev

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

	* src/Core/Banshee.Core/Resources/COPYING: Update to 2008.

	* src/Clients/Nereid/Nereid/PlayerInterface.cs:
	* src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:
	* src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:
	* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:
	* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:
	* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:
	* src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs: Fix warnings.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
   trunk/banshee/src/Core/Banshee.Core/Resources/COPYING
   trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
   trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs

Modified: trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs	(original)
+++ trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs	Wed Mar  5 16:37:51 2008
@@ -199,7 +199,6 @@
             footer_toolbar = (Toolbar)ActionService.UIManager.GetWidget ("/FooterToolbar");
             footer_toolbar.ShowArrow = false;
             footer_toolbar.ToolbarStyle = ToolbarStyle.BothHoriz;
-            footer_toolbar.IconSize = IconSize.Menu;
 
             status_label = new Label ();
             status_label.ModifyFg (StateType.Normal, Hyena.Gui.GtkUtilities.ColorBlend (

Modified: trunk/banshee/src/Core/Banshee.Core/Resources/COPYING
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Resources/COPYING	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Resources/COPYING	Wed Mar  5 16:37:51 2008
@@ -1,4 +1,4 @@
-Copyright (C) 2005-2007 Novell, Inc.
+Copyright (C) 2005-2008 Novell, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs	Wed Mar  5 16:37:51 2008
@@ -49,8 +49,6 @@
 {
     public class PlaylistSource : AbstractPlaylistSource, IUnmapableSource
     {
-        //private static HyenaSqliteCommand add_track_command;
-        private static HyenaSqliteCommand remove_track_command;
         private static HyenaSqliteCommand add_track_range_command;
         private static HyenaSqliteCommand remove_track_range_command;
 
@@ -72,15 +70,6 @@
 
         static PlaylistSource () 
         {
-            //add_track_command = new HyenaSqliteCommand (
-            //    "INSERT INTO CorePlaylistEntries (PlaylistID, TrackID) VALUES (?, ?)"
-            //);
-
-            remove_track_command = new HyenaSqliteCommand (
-                "DELETE FROM CorePlaylistEntries WHERE PlaylistID = ? AND TrackID = ?"
-                //"DELETE FROM CorePlaylistEntries WHERE PlaylistID = ? AND EntryID = ?"
-            );
-
             add_track_range_command = new HyenaSqliteCommand (@"
                 INSERT INTO CorePlaylistEntries
                     SELECT null, ?, ItemID, 0

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs	Wed Mar  5 16:37:51 2008
@@ -71,8 +71,6 @@
     {
         protected ErrorSource error_source = new ErrorSource (Catalog.GetString ("Import Errors"));
         protected bool error_source_visible = false;
-        //protected RateLimiter tracks_updated_limiter;
-        private double tracks_updated_ms = 250.0;
 
         protected string remove_range_sql = @"
             INSERT INTO CoreRemovedTracks SELECT ?, TrackID, Uri FROM CoreTracks WHERE TrackID IN ({0});
@@ -110,15 +108,9 @@
             error_source.Updated += OnErrorSourceUpdated;
             OnErrorSourceUpdated (null, null);
 
-            //tracks_updated_limiter = new RateLimiter (20.0, tracks_updated_ms, RateLimitedOnTracksUpdated);
-
             primary_sources[source_id] = this;
         }
 
-        public bool Importing {
-            set { tracks_updated_ms = value ? 5000.0 : 250.0; }
-        }
-
         internal void NotifyTracksAdded ()
         {
             OnTracksAdded ();

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs	Wed Mar  5 16:37:51 2008
@@ -53,10 +53,6 @@
     {
         private LastfmSource lastfm;
 
-        private ActionButton love_button;
-        private ActionButton hate_button;
-        private bool last_track_was_lastfm = false;
-
         private InterfaceActionService action_service;
         private uint actions_id;
         private ActionGroup actions;
@@ -200,7 +196,10 @@
 
         public override void Dispose ()
         {
-            actions = null;
+            if (actions != null) {
+                action_service.UIManager.RemoveUi (actions_id);
+                actions = null;
+            }
             base.Dispose ();
         }
 
@@ -229,16 +228,6 @@
             }
         }
 
-        private void OnChangeStation (object sender, EventArgs args)
-        {
-            (ServiceManager.SourceManager.ActiveSource as StationSource).ChangeToThisStation ();
-        }
-
-        private void OnRefreshStation (object sender, EventArgs args)
-        {
-            (ServiceManager.SourceManager.ActiveSource as StationSource).Refresh ();
-        }
-
         private void OnLoved (object sender, EventArgs args)
         {
             LastfmTrackInfo track = ServiceManager.PlayerEngine.CurrentTrack as LastfmTrackInfo;

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	Wed Mar  5 16:37:51 2008
@@ -272,10 +272,10 @@
             UpdateUI ();
         }
 
-        private void HandleChildUpdated (object sender, EventArgs args)
+        /*private void HandleChildUpdated (object sender, EventArgs args)
         {
             SortChildSources ();
-        }
+        }*/
 
         private void UpdateUI ()
         {

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs	Wed Mar  5 16:37:51 2008
@@ -174,7 +174,7 @@
             OnUpdated ();
         }
         
-        private bool shuffle;
+        //private bool shuffle;
         public override void Activate ()
         {
             base.Activate ();

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs	Wed Mar  5 16:37:51 2008
@@ -236,9 +236,7 @@
 
         public override long Reload ()
         {
-            if (last_reload_fragment == model.ReloadFragment) {
-                last_reload_command = last_reload_command;
-            } else {
+            if (last_reload_fragment != model.ReloadFragment) {
                 last_reload_fragment = model.ReloadFragment;
                 last_reload_command = new HyenaSqliteCommand (reload_sql + last_reload_fragment);
             }