[meego-commits] 6890: Changes to Trunk:Netbook/meego-panel-devices

[itachi]

Hi,
I have made the following changes to meego-panel-devices in project Trunk:Netbook. Please review and accept ASAP.

Thank You,
itachi

[This message was auto-generated]

---

Request #6890:

  submit:   home:itachi:branches:Trunk:Netbook/meego-panel-devices(r2)(cleanup) -> Trunk:Netbook/meego-panel-devices


Message:
    a patch to fixed BMC#3928

State:   new          2010-08-22T17:36:15 itachi
Comment: None



changes files:
--------------
--- meego-panel-devices.changes
+++ meego-panel-devices.changes
@@ -0,0 +1,3 @@
+* Mon Aug 23 2010 Yang Chengwei <chengwei.yang at intel.com> - 0.2.4
+- Commit a patch to fix BMC#3928.
+

new:
----
  mpd-autosuspend.patch

spec files:
-----------
--- meego-panel-devices.spec
+++ meego-panel-devices.spec
@@ -1,6 +1,6 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.16
+# spectacle version 0.18
 # 
 # >> macros
 # << macros
@@ -14,12 +14,14 @@
 URL:        http://www.meego.com
 Source0:    %{name}-%{version}.tar.gz
 Source100:  meego-panel-devices.yaml
+Patch0:     mpd-autosuspend.patch
 Requires:   mutter-meego
 Requires:   gthumb
 Requires(pre): GConf2
 Requires(preun): GConf2
-Requires(post): /bin/touch
 Requires(post): GConf2
+Requires(post): /bin/touch
+Requires(post): gtk2
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(libcanberra-gtk)
 BuildRequires:  pkgconfig(libpulse-mainloop-glib) >= 0.9.15
@@ -36,6 +38,7 @@
 BuildRequires:  gnome-common
 Obsoletes:   moblin-panel-devices
 
+
 %description
 Meego devices panel
 
@@ -52,6 +55,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+# mpd-autosuspend.patch
+%patch0 -p1
 # >> setup
 # << setup
 

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

++++++ meego-panel-devices.yaml
--- meego-panel-devices.yaml
+++ meego-panel-devices.yaml
@@ -10,6 +10,9 @@
 Sources:
     - "%{name}-%{version}.tar.gz"
 
+Patches:
+    - mpd-autosuspend.patch
+
 Requires:
     - mutter-meego
     - gthumb

++++++ mpd-autosuspend.patch (new)
--- mpd-autosuspend.patch
+++ mpd-autosuspend.patch
+diff -uNr meego-panel-devices-0.2.4/power-icon/src/mpd-idle-manager.c meego-panel-devices-0.2.4.new/power-icon/src/mpd-idle-manager.c
+--- meego-panel-devices-0.2.4/power-icon/src/mpd-idle-manager.c	2010-07-12 19:55:02.000000000 +0800
++++ meego-panel-devices-0.2.4.new/power-icon/src/mpd-idle-manager.c	2010-08-23 10:29:28.536500663 +0800
+@@ -185,10 +185,12 @@
+   if (!ret)
+     return false;
+ 
++  /*
+   ret = dkp_client_suspend (priv->power_client, error);
+ 
+   dbus_g_proxy_call_no_reply (priv->screensaver, "SimulateUserActivity",
+                               G_TYPE_INVALID);
++  */
+ 
+   return ret;
+ }