[meego-commits] 9489: Changes to Trunk:Netbook/banshee-1
Han Dai
no_reply at build.meego.com
Mon Nov 15 03:08:43 UTC 2010
Hi,
I have made the following changes to banshee-1 in project Trunk:Netbook. Please review and accept ASAP.
Thank You,
Han Dai
[This message was auto-generated]
---
Request #9489:
submit: home:daihan:branches:Trunk:Netbook/banshee-1(r2)(cleanup) -> Trunk:Netbook/banshee-1
Message:
Add patches to fix BMC#8982 BMC#9008 BMC#9018
State: new 2010-11-14T19:08:42 daihan
Comment: None
changes files:
--------------
--- banshee-1.changes
+++ banshee-1.changes
@@ -1,0 +2,11 @@
+Mon Nov 15 10:28:46 UTC 2010 - ting.z.zhou at intel.com
+
+- Added switch-to-nowplaying-on-video-start-bmc8982.patch (bmc#8982)
+
+- Added del-dup-item-in-import-dialog-bmc9008.patch, remove duplicated
+ "Music" and "Video" items in import media dialogue (bmc#9008)
+
+- Added sync-search-query-bmc9018.patch, the search entry in MeeGo panel
+ can show the search query properly (bmc#9018)
+
+-------------------------------------------------------------------
new:
----
del-dup-item-in-import-dialog-bmc9008.patch
switch-to-nowplaying-on-video-start-bmc8982.patch
sync-search-query-bmc9018.patch
spec files:
-----------
--- banshee-1.spec
+++ banshee-1.spec
@@ -27,6 +27,9 @@
Patch10: search-unknown-artist-album-bmc6228.patch
Patch11: insert-volume-element-in-pipeline-bmc9003.patch
Patch12: pause-video-on-window-close-bmc8964.patch
+Patch13: switch-to-nowplaying-on-video-start-bmc8982.patch
+Patch14: del-dup-item-in-import-dialog-bmc9008.patch
+Patch15: sync-search-query-bmc9018.patch
Requires: %{name}-core = %{version}
Requires: %{name}-backend-platform-unix = %{version}
Requires: gst-plugins-good
@@ -221,6 +224,12 @@
%patch11 -p1
# pause-video-on-window-close-bmc8964.patch
%patch12 -p1
+# switch-to-nowplaying-on-video-start-bmc8982.patch
+%patch13 -p1
+# del-dup-item-in-import-dialog-bmc9008.patch
+%patch14 -p1
+# sync-search-query-bmc9018.patch
+%patch15 -p1
# >> setup
# << setup
other changes:
--------------
++++++ banshee-1.yaml
--- banshee-1.yaml
+++ banshee-1.yaml
@@ -48,6 +48,12 @@
- insert-volume-element-in-pipeline-bmc9003.patch
# MEEGO SPECIFIC (EVALUATE UPSTREAM)
- pause-video-on-window-close-bmc8964.patch
+ # MEEGO SPECIFIC (EVALUATE UPSTREAM)
+ - switch-to-nowplaying-on-video-start-bmc8982.patch
+ # MEEGO SPECIFIC (EVALUATE UPSTREAM)
+ - del-dup-item-in-import-dialog-bmc9008.patch
+ # MEEGO SPECIFIC (EVALUATE UPSTREAM)
+ - sync-search-query-bmc9018.patch
Requires:
- "%{name}-core = %{version}"
++++++ del-dup-item-in-import-dialog-bmc9008.patch (new)
--- del-dup-item-in-import-dialog-bmc9008.patch
+++ del-dup-item-in-import-dialog-bmc9008.patch
+diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs
+index 5f1c3d2..c277274 100644
+--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs
++++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs
+@@ -51,11 +51,6 @@ namespace Banshee.Gui.Dialogs
+ // Translators: verb
+ chooser.AddButton (Mono.Unix.Catalog.GetString("I_mport"), ResponseType.Ok);
+
+- Hyena.Gui.GtkUtilities.SetChooserShortcuts (chooser,
+- ServiceManager.SourceManager.MusicLibrary.BaseDirectory,
+- ServiceManager.SourceManager.VideoLibrary.BaseDirectory
+- );
+-
+ return chooser;
+ }
+
++++++ switch-to-nowplaying-on-video-start-bmc8982.patch (new)
--- switch-to-nowplaying-on-video-start-bmc8982.patch
+++ switch-to-nowplaying-on-video-start-bmc8982.patch
+From 1c6c64f07de93319860e4f58fac9d4f1687296db Mon Sep 17 00:00:00 2001
+From: Aaron Bockover <abockover at novell.com>
+Date: Sat, 31 Jul 2010 22:53:29 +0200
+Subject: [PATCH] Call OnTrackStarted on a PlayerEvent.StartOfStream
+
+This may just be a workaround and it needs to be verified. It should
+already be handled by the PlayerEvent.StateChange event when
+transitioning between tracks.
+
+This seems to fix bmc#1748
+---
+ .../PlaybackControllerService.cs | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
+index 8dfb9fc..9f8743b 100644
+--- a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
++++ b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
+@@ -131,6 +131,11 @@ namespace Banshee.PlaybackController
+ case PlayerEvent.StartOfStream:
+ CurrentTrack = player_engine.CurrentTrack;
+ consecutive_errors = 0;
++
++ // TODO: verify if this is the correct fix
++ // for bmc1748; this should be handled already
++ // by the PlayerEvent.StateChange event below
++ OnTrackStarted ();
+ break;
+ case PlayerEvent.EndOfStream:
+ EosTransition ();
+--
+1.7.1
+
++++++ sync-search-query-bmc9018.patch (new)
--- sync-search-query-bmc9018.patch
+++ sync-search-query-bmc9018.patch
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+index 72b3585..92c0e98 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+@@ -41,6 +41,7 @@ using Banshee.Sources.Gui;
+ using Banshee.Collection;
+ using Banshee.Collection.Gui;
+ using Banshee.MediaEngine;
++using Banshee.Gui;
+ using Banshee.Gui.Widgets;
+
+ namespace Banshee.MeeGo
+@@ -82,6 +83,9 @@ namespace Banshee.MeeGo
+ {
+ ServiceManager.SourceManager.ActiveSourceChanged += OnActiveSourceChanged;
+
++ ServiceManager.Get<InterfaceActionService> ().TrackActions ["SearchForSameArtistAction"].Activated += OnProgrammaticSearch;
++ ServiceManager.Get<InterfaceActionService> ().TrackActions ["SearchForSameAlbumAction"].Activated += OnProgrammaticSearch;
++
+ ServiceManager.PlayerEngine.ConnectEvent ((args) => track_info_display.Visible =
+ ServiceManager.PlayerEngine.CurrentState != PlayerState.Idle,
+ PlayerEvent.StateChange | PlayerEvent.StartOfStream);
+@@ -246,6 +250,14 @@ namespace Banshee.MeeGo
+
+ #region Event Handlers
+
++ private void OnProgrammaticSearch (object o, EventArgs args)
++ {
++ Source source = ServiceManager.SourceManager.ActiveSource;
++ search_entry.Ready = false;
++ search_entry.Query = source.FilterQuery;
++ search_entry.Ready = true;
++ }
++
+ private void OnBrowserViewSelectionChanged (object o, EventArgs args)
+ {
+ // Scroll the raising filter view to the top if "all" is selected
More information about the MeeGo-commits
mailing list