[meego-commits] 24512: Changes to MeeGo:1.2.0:CedarTrail:oss/meego-panel-devices

[Ulf Hofemeier]

Hi,
I have made the following changes to meego-panel-devices in project MeeGo:1.2.0:CedarTrail:oss. Please review and accept ASAP.

Thank You,
Ulf Hofemeier

[This message was auto-generated]

---

Request #24512:

  submit:   MeeGo:1.2.0:oss:Update:Testing/meego-panel-devices(rc0ec2acddd9fa969a8abae3491f57815) -> MeeGo:1.2.0:CedarTrail:oss/meego-panel-devices


Message:
    * Tue Nov 1 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 0.2.10
- Fix media import using banshee (BMC#23799)

State:   new          2011-11-10T08:58:49 ulf
Comment: None



changes files:
--------------
--- meego-panel-devices.changes
+++ meego-panel-devices.changes
@@ -0,0 +1,3 @@
+* Tue Nov 1 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 0.2.10
+- Fix media import using banshee (BMC#23799)
+

new:
----
  0002-storage-import-media-using-banshee-rather-than-bansh.patch

spec files:
-----------
--- meego-panel-devices.spec
+++ meego-panel-devices.spec
@@ -15,6 +15,7 @@
 Source0:    %{name}-%{version}.tar.gz
 Source100:  meego-panel-devices.yaml
 Patch0:     0001-volume-tile-Show-the-mute-icon-when-the-volume-value.patch
+Patch1:     0002-storage-import-media-using-banshee-rather-than-bansh.patch
 Requires:   mutter-netbook
 Requires:   gthumb
 Requires:   gvfs-trash
@@ -58,6 +59,8 @@
 
 # 0001-volume-tile-Show-the-mute-icon-when-the-volume-value.patch
 %patch0 -p1
+# 0002-storage-import-media-using-banshee-rather-than-bansh.patch
+%patch1 -p1
 # >> setup
 # << setup
 

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

++++++ 0002-storage-import-media-using-banshee-rather-than-bansh.patch (new)
--- 0002-storage-import-media-using-banshee-rather-than-bansh.patch
+++ 0002-storage-import-media-using-banshee-rather-than-bansh.patch
+From 9dee1c487a5cefd9d52feaf9e2d8e67c808ccadb Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com>
+Date: Tue, 1 Nov 2011 14:49:42 +0000
+Subject: [PATCH] storage: import media using banshee rather than banshee-1
+
+---
+ src/mpd-storage-device-tile.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mpd-storage-device-tile.c b/src/mpd-storage-device-tile.c
+index a1d3b2c..c10f96b 100644
+--- a/src/mpd-storage-device-tile.c
++++ b/src/mpd-storage-device-tile.c
+@@ -233,7 +233,7 @@ _import_clicked_cb (MxButton             *button,
+       launch_import (self, program, "--import-photos", &error);
+   } else
+   {
+-    program = "banshee-1";
++    program = "banshee";
+     launch_import (self, program, "--show-import-media", &error);
+   }
+ 
+-- 
+1.7.7.1
+

++++++ meego-panel-devices.yaml
--- meego-panel-devices.yaml
+++ meego-panel-devices.yaml
@@ -12,6 +12,7 @@
 
 Patches:
     - 0001-volume-tile-Show-the-mute-icon-when-the-volume-value.patch
+    - 0002-storage-import-media-using-banshee-rather-than-bansh.patch
 
 Requires:
     - mutter-netbook
@@ -47,8 +48,8 @@
 UseAsNeeded: yes
 
 SubPackages:
-    - Name: test  
+    - Name: test
       Summary: Test programs for the devices panel
-      Group: Development/Tools  
+      Group: Development/Tools
       Description: Programs for testing hardware and software