banshee r4122 - in trunk/banshee: . src/Core/Banshee.ThickClient/Resources src/Extensions/Banshee.Podcasting/Resources src/Libraries/Lastfm/Lastfm

[gburt svn gnome org]

Author: gburt
Date: Thu Jun  5 16:54:23 2008
New Revision: 4122
URL: http://svn.gnome.org/viewvc/banshee?rev=4122&view=rev

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

	* src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs: Remove some
	verbose logging.

	* src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml:
	* src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml: Add
	the Subscribe to Podcast menu item to the Media menu.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
   trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml
   trunk/banshee/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	Thu Jun  5 16:54:23 2008
@@ -24,6 +24,7 @@
       <menuitem name="Import" action="ImportAction"/>
       <!--<menuitem name="ImportPlaylist" action="ImportPlaylistAction"/>-->
       <menuitem name="OpenLocation" action="OpenLocationAction"/>
+      <placeholder name="BelowOpenLocation"/>
       <separator/>
       <placeholder name="ClosePlaceholder"/>
       <menuitem name="Quit" action="QuitAction"/>

Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml	(original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml	Thu Jun  5 16:54:23 2008
@@ -1,4 +1,12 @@
 <ui>
+    <menubar name="MainMenu" action="MainMenuAction">
+      <menu name="MediaMenu" action="MediaMenuAction">
+        <placeholder name="BelowOpenLocation">
+          <menuitem name="PodcastAdd" action="PodcastAddAction" />
+        </placeholder>
+      </menu>
+    </menubar>
+
     <popup name="PodcastSourcePopup" action="PodcastSourcePopupAction">
         <menuitem name="PodcastAdd" action="PodcastAddAction" />
         <menuitem name="PodcastUpdateAll" action="PodcastUpdateAllAction"/>

Modified: trunk/banshee/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
==============================================================================
--- trunk/banshee/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs	(original)
+++ trunk/banshee/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs	Thu Jun  5 16:54:23 2008
@@ -169,8 +169,6 @@
 
         private void StateTransitionHandler (object o, ElapsedEventArgs e)
         {
-            Log.DebugFormat ("State transition handler running; state: {0}, connected: {1}", state, connected);
-            
             // if we're not connected, don't bother doing anything involving the network.
             if (!connected) {
                 return;
@@ -195,7 +193,6 @@
                         // Now playing info needs to be sent
                         NowPlaying (current_now_playing_uri);
                     } else {
-                        Hyena.Log.DebugFormat ("State transition handler going to sleep.");
                         StopTransitionHandler ();
                     }
                 }