[meego-commits] 9114: Changes to MeeGo:1.0:Netbook:Update:Testing/banshee-1

[Han Dai]

Hi,
I have made the following changes to banshee-1 in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
Han Dai

[This message was auto-generated]

---

Request #9114:

  submit:   home:daihan:branches:MeeGo:1.0:Netbook:Update:Testing/banshee-1(r2)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/banshee-1


Message:
    Add a patch to fix BMC#2356

State:   new          2010-10-31T23:24:13 daihan
Comment: None



changes files:
--------------
--- banshee-1.changes
+++ banshee-1.changes
@@ -1,0 +2,6 @@
+Mon Nov  1 02:00:59 CST 2010 - ting.z.zhou at intel.com
+
+- Added pause-video-on-window-close-bmc2356.patch, make video pause
+  when click x to close banshee window (bmc#2356)
+
+-------------------------------------------------------------------

new:
----
  pause-video-on-window-close-bmc2356.patch

spec files:
-----------
--- banshee-1.spec
+++ banshee-1.spec
@@ -76,6 +76,8 @@
 Patch17:        gapless-repeat-off-bmc5097.patch
 # PATCH IS UPSTREAM (stable 1.7)
 Patch18:        escape-uri-in-sql-bmc2095.patch
+# PATCH IS MEEGO SPECIFIC (EVALUATE UPSTREAM)
+Patch19:        pause-video-on-window-close-bmc2356.patch
 
 # PATCH IS INTEL MEEGO SPECIFIC
 Patch100:       media-as-meego-icon-name.patch
@@ -678,6 +680,7 @@
 %patch16 -p1 -b .trans-predefined-smart-playlists-bmc1092.patch
 %patch17 -p1 -b .gapless-repeat-off-bmc5097.patch
 %patch18 -p1 -b .escape-uri-in-sql-bmc2095.patch
+%patch19 -p1 -b .pause-video-on-window-close-bmc2356.patch
 %if !0%{?suse_version}
 %patch100 -p1 -b .media-as-meego-icon-name
 %endif

other changes:
--------------

++++++ pause-video-on-window-close-bmc2356.patch (new)
--- pause-video-on-window-close-bmc2356.patch
+++ pause-video-on-window-close-bmc2356.patch
+diff -Nur old/src/Clients/Nereid/Nereid/PlayerInterface.cs new/src/Clients/Nereid/Nereid/PlayerInterface.cs
+--- old/src/Clients/Nereid/Nereid/PlayerInterface.cs	2010-05-08 02:20:18.000000000 +0800
++++ new/src/Clients/Nereid/Nereid/PlayerInterface.cs	2010-10-20 17:31:04.000000000 +0800
+@@ -223,7 +223,15 @@
+                     TooltipText = Catalog.GetString ("Close")
+                 };
+ 
+-                close_button.Clicked += (o, e) => Hide ();
++                close_button.Clicked += (o, e) => {
++                    if (ServiceManager.PlayerEngine.IsPlaying () &&
++                       (ServiceManager.PlayerEngine.CurrentState != PlayerState.Paused)  &&
++                        ServiceManager.PlayerEngine.CurrentTrack.HasAttribute (TrackMediaAttributes.VideoStream)) {
++                        ServiceManager.PlayerEngine.Pause ();
++                    }
++
++                    Hide ();
++                };
+                 close_button.ShowAll ();
+                 ActionService.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/ClosePlaceholder", close_button);
+             } else {