banshee r3215 - in trunk/banshee: . src/Core/Banshee.ThickClient src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui src/Core/Banshee.ThickClient/Banshee.Collection.Gui src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Core/Banshee.ThickClient/Banshee.Library.Gui src/Core/Banshee.ThickClient/Banshee.Sources.Gui
- From: abock svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3215 - in trunk/banshee: . src/Core/Banshee.ThickClient src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui src/Core/Banshee.ThickClient/Banshee.Collection.Gui src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Core/Banshee.ThickClient/Banshee.Library.Gui src/Core/Banshee.ThickClient/Banshee.Sources.Gui
- Date: Mon, 11 Feb 2008 03:50:07 +0000 (GMT)
Author: abock
Date: Mon Feb 11 03:50:06 2008
New Revision: 3215
URL: http://svn.gnome.org/viewvc/banshee?rev=3215&view=rev
Log:
2008-02-10 Aaron Bockover <abock gnome org>
* src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileComboBoxConfigurable.cs:
* src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs:
* src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs:
* src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CompositeTrackListView.cs:
* src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs:
* src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/PlaylistMenuItem.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:
* src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:
* src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:
* src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp:
* src/Core/Banshee.ThickClient/Makefile.am: More warnings fixed
Added:
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/PlaylistMenuItem.cs
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileComboBoxConfigurable.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CompositeTrackListView.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp
trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileComboBoxConfigurable.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileComboBoxConfigurable.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileComboBoxConfigurable.cs Mon Feb 11 03:50:06 2008
@@ -1,31 +1,31 @@
-/***************************************************************************
- * ProfileComboBoxConfigurable.cs
- *
- * Copyright (C) 2006 Novell, Inc.
- * Written by Aaron Bockover <aaron abock org>
- ****************************************************************************/
+//
+// ProfileComboBoxConfigurable.cs
+//
+// Author:
+// Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2006-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:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
-/* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
using System;
using Gtk;
@@ -38,8 +38,6 @@
private TextViewLabel description;
private string configuration_id;
- private static Gdk.Color window_color = Gdk.Color.Zero;
-
public ProfileComboBoxConfigurable(ProfileManager manager, string configurationId)
: this(manager, configurationId, null)
{
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs Mon Feb 11 03:50:06 2008
@@ -1,31 +1,31 @@
-/***************************************************************************
- * ProfileConfigurationDialog.cs
- *
- * Copyright (C) 2006 Novell, Inc.
- * Written by Aaron Bockover <aaron abock org>
- ****************************************************************************/
-
-/* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
+//
+// ProfileConfigurationDialog.cs
+//
+// Author:
+// Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2006-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:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
using System;
using System.Collections.Generic;
using Mono.Unix;
@@ -366,10 +366,8 @@
double step = variable.StepValue;
double current = min;
- TreeIter iter;
-
for(; current <= max; current += step) {
- iter = ComboAppend(model, variable, current.ToString(), current.ToString());
+ ComboAppend(model, variable, current.ToString(), current.ToString());
}
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs Mon Feb 11 03:50:06 2008
@@ -38,7 +38,6 @@
{
public class ColumnCellAlbum : ColumnCell
{
- private static int pixbuf_size = 48;
private static int pixbuf_spacing = 4;
private static Gdk.Pixbuf default_cover_pixbuf = IconThemeUtils.LoadIcon (48, "media-optical");
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CompositeTrackListView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CompositeTrackListView.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CompositeTrackListView.cs Mon Feb 11 03:50:06 2008
@@ -66,7 +66,6 @@
private Widget browser_container;
private InterfaceActionService action_service;
private ActionGroup browser_view_actions;
- private uint action_merge_id;
private static string menu_xml = @"
<ui>
@@ -116,7 +115,7 @@
});
action_service.AddActionGroup (browser_view_actions);
- action_merge_id = action_service.UIManager.NewMergeId ();
+ //action_merge_id = action_service.UIManager.NewMergeId ();
action_service.UIManager.AddUiFromString (menu_xml);
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs Mon Feb 11 03:50:06 2008
@@ -116,7 +116,6 @@
protected override void OnDragDataGet (Gdk.DragContext context, SelectionData selection_data, uint info, uint time)
{
- byte [] selection_data_raw;
DragDropTargetType type = (DragDropTargetType)info;
if (type != DragDropTargetType.ModelSelection || Selection.Count <= 0) {
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs Mon Feb 11 03:50:06 2008
@@ -91,8 +91,6 @@
}
eq_enabled_checkbox.Clicked += OnEnableDisable;
-
- Window.Show ();
}
private void OnNewPreset (object o, EventArgs args)
Added: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/PlaylistMenuItem.cs
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/PlaylistMenuItem.cs Mon Feb 11 03:50:06 2008
@@ -0,0 +1,50 @@
+//
+// PlaylistMenuItem.cs
+//
+// Author:
+// Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 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:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using Gtk;
+
+
+using Banshee.Playlist;
+
+namespace Banshee.Gui.Widgets
+{
+ public class PlaylistMenuItem : ImageMenuItem
+ {
+ private PlaylistSource playlist;
+
+ public PlaylistMenuItem (PlaylistSource playlist) : base (playlist.Name)
+ {
+ this.playlist = playlist;
+ }
+
+ public PlaylistSource Playlist {
+ get { return playlist; }
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs Mon Feb 11 03:50:06 2008
@@ -239,9 +239,6 @@
private void RenderAnimation (Cairo.Context cr, Gdk.Rectangle clip)
{
- Cairo.Surface ps;
- Cairo.Context pcr;
-
if (stage.Actor == null) {
// We are not in a transition, just render
RenderStage (cr, current_track, current_pixbuf);
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs Mon Feb 11 03:50:06 2008
@@ -148,7 +148,7 @@
}
}
- private void OnImportPlaylist (object o, EventArgs args)
+ /*private void OnImportPlaylist (object o, EventArgs args)
{
// Prompt user for location of the playlist.
Banshee.Gui.Dialogs.FileChooserDialog chooser = new Banshee.Gui.Dialogs.FileChooserDialog(
@@ -209,7 +209,7 @@
md.Destroy();
return;
}
- }
+ }*/
private void OnQuit (object o, EventArgs args)
{
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs Mon Feb 11 03:50:06 2008
@@ -103,6 +103,10 @@
}
}
+ public BansheeIconFactory IconFactory {
+ get { return icon_factory; }
+ }
+
PropertyStore IPropertyStoreExpose.PropertyStore {
get { return property_store; }
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs Mon Feb 11 03:50:06 2008
@@ -41,6 +41,7 @@
using Banshee.ServiceStack;
using Banshee.Widgets;
using Banshee.Gui.Dialogs;
+using Banshee.Gui.Widgets;
namespace Banshee.Gui
{
@@ -297,11 +298,10 @@
separator_added = true;
}
- ImageMenuItem item = new ImageMenuItem (playlist.Name);
+ PlaylistMenuItem item = new PlaylistMenuItem (playlist);
item.Image = new Gtk.Image (pl_pb);
item.Activated += OnAddToExistingPlaylist;
item.Sensitive = playlist != active_source;
- item.Data.Add ("playlist", playlist);
submenu.Append (item);
}
}
@@ -324,10 +324,7 @@
private void OnAddToExistingPlaylist (object o, EventArgs args)
{
- MenuItem item = (MenuItem)o;
- if (item.Data != null && item.Data.ContainsKey ("playlist")) {
- ((PlaylistSource)item.Data["playlist"]).AddSelectedTracks (TrackSelector.TrackModel);
- }
+ ((PlaylistMenuItem)o).Playlist.AddSelectedTracks (TrackSelector.TrackModel);
}
private void OnRemoveTracks (object o, EventArgs args)
@@ -380,7 +377,7 @@
private void OnSearchForSameArtist (object o, EventArgs args)
{
Source source = ServiceManager.SourceManager.ActiveSource;
- ITrackModelSource track_source = source as ITrackModelSource;
+ // ITrackModelSource track_source = source as ITrackModelSource; FIXME: What? --Aaron
foreach (TrackInfo track in TrackSelector.GetSelectedTracks ()) {
source.FilterQuery = BansheeQuery.ArtistField.ToTermString (":", track.ArtistName);
break;
@@ -390,16 +387,16 @@
private void OnSearchForSameAlbum (object o, EventArgs args)
{
Source source = ServiceManager.SourceManager.ActiveSource;
- ITrackModelSource track_source = source as ITrackModelSource;
+ // ITrackModelSource track_source = source as ITrackModelSource; FIXME: What? --Aaron
foreach (TrackInfo track in TrackSelector.GetSelectedTracks ()) {
source.FilterQuery = BansheeQuery.AlbumField.ToTermString (":", track.AlbumTitle);
break;
}
}
- private void OnJumpToPlayingTrack (object o, EventArgs args)
+ /*private void OnJumpToPlayingTrack (object o, EventArgs args)
{
- }
+ }*/
#endregion
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs Mon Feb 11 03:50:06 2008
@@ -76,6 +76,7 @@
private void OnShowEqualizer (object o, EventArgs args)
{
EqualizerWindow eqwin = new EqualizerWindow ();
+ eqwin.Window.Show ();
}
}
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs Mon Feb 11 03:50:06 2008
@@ -52,7 +52,7 @@
accel_group = new AccelGroup ();
if (ServiceManager.Contains ("GtkElementsService")) {
- Dialog.TransientFor = ServiceManager.Get<GtkElementsService> ("GtkElementsService").PrimaryWindow;
+ Dialog.TransientFor = ServiceManager.Get<GtkElementsService> ().PrimaryWindow;
}
Dialog.WindowPosition = WindowPosition.CenterOnParent;
@@ -93,10 +93,9 @@
source_combo_box.SetAttributes (text_cr, "text", 1);
TreeIter active_iter = TreeIter.Zero;
- TreeIter migration_iter = TreeIter.Zero;
// Add the standalone import sources
- foreach (IImportSource source in ServiceManager.Get<ImportSourceManager> ("ImportSourceManager")) {
+ foreach (IImportSource source in ServiceManager.Get<ImportSourceManager> ()) {
AddSource (source);
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs Mon Feb 11 03:50:06 2008
@@ -53,7 +53,6 @@
private ListViewGraphics graphics;
private Cairo.Context cr;
- private uint user_update_timeout_id = 0;
private Stage<TreeIter> notify_stage = new Stage<TreeIter> (2000);
private TreeStore store;
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp Mon Feb 11 03:50:06 2008
@@ -86,6 +86,7 @@
<File name="Banshee.Query.Gui/PlaylistQueryValueEntry.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.SmartPlaylist.Gui/Editor.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Collection.Gui/PersistentColumnController.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.Gui.Widgets/PlaylistMenuItem.cs" subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Project" localcopy="False" refto="Hyena.Gui" />
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am Mon Feb 11 03:50:06 2008
@@ -46,6 +46,7 @@
Banshee.Gui.Widgets/TrackInfoDisplay.cs \
Banshee.Gui.Widgets/UserJobTile.cs \
Banshee.Gui.Widgets/UserJobTileHost.cs \
+ Banshee.Gui.Widgets/PlaylistMenuItem.cs \
Banshee.Gui/BansheeActionGroup.cs \
Banshee.Gui/BansheeIconFactory.cs \
Banshee.Gui/CommonServices.cs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
