[banshee/source-contents: 140/141] Incorrectly resolved the merge conflict; fixed
- From: Gabriel Burt <gburt src gnome org>
- To: svn-commits-list gnome org
- Subject: [banshee/source-contents: 140/141] Incorrectly resolved the merge conflict; fixed
- Date: Wed, 17 Jun 2009 19:58:31 -0400 (EDT)
commit 1e45704f0b18c2e6c3e1ac7221751bebdfd0ea60
Author: Gabriel Burt <gabriel burt gmail com>
Date: Wed Jun 17 18:03:49 2009 -0500
Incorrectly resolved the merge conflict; fixed
.../Banshee.NowPlaying/NowPlayingSource.cs | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
index 83779b3..ceeb4fd 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
@@ -46,8 +46,6 @@ namespace Banshee.NowPlaying
public NowPlayingSource () : base ("now-playing", Catalog.GetString ("Now Playing"), 10, "now-playing")
{
- now_playing_interface = new NowPlayingInterface ();
-
Properties.SetString ("Icon.Name", "applications-multimedia");
//Properties.Set<bool> ("Nereid.SourceContents.HeaderVisible", false);
Properties.SetString ("ActiveSourceUIResource", "ActiveSourceUI.xml");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]