[apper/f16] systray_actions patch/hack

[Rex Dieter]

commit bf1eb50c1914cf03ff2042caf5d520f8c902a91f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 19 08:56:12 2011 -0500

    systray_actions patch/hack

 apper-0.7.0-systray_actions.patch |   37 +++++++++++++++++++++++++++++++++++++
 apper.spec                        |   10 +++++++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/apper-0.7.0-systray_actions.patch b/apper-0.7.0-systray_actions.patch
new file mode 100644
index 0000000..75f2872
--- /dev/null
+++ b/apper-0.7.0-systray_actions.patch
@@ -0,0 +1,37 @@
+diff -up apper-0.7.0/Sentinel/UpdateIcon.cpp.systray_actions apper-0.7.0/Sentinel/UpdateIcon.cpp
+--- apper-0.7.0/Sentinel/UpdateIcon.cpp.systray_actions	2011-10-10 10:34:18.000000000 -0500
++++ apper-0.7.0/Sentinel/UpdateIcon.cpp	2011-10-19 08:45:20.680193295 -0500
+@@ -33,6 +33,7 @@
+ #include <KActionCollection>
+ #include <KMenu>
+ #include <KToolInvocation>
++#include <qprocess.h>
+ 
+ #include <Solid/PowerManagement>
+ 
+@@ -59,7 +60,11 @@ UpdateIcon::~UpdateIcon()
+ 
+ void UpdateIcon::showSettings()
+ {
+-    KToolInvocation::startServiceByDesktopName("Apper", QStringList() << "--settings");
++// try QProcess:execute first, KToolInvocation::startServiceByDesktopName seems to not work
++// giving .xsession-errors like: kioexec: Unknown option 'settings'.
++  if ( ! QProcess::execute("apper", QStringList() << "--settings")) {
++      KToolInvocation::startServiceByDesktopName("Apper", QStringList() << "--settings");
++  }
+ }
+ 
+ void UpdateIcon::refresh(bool update)
+@@ -294,7 +299,11 @@ void UpdateIcon::autoUpdatesFinished(Pac
+ 
+ void UpdateIcon::showUpdates()
+ {
+-    KToolInvocation::startServiceByDesktopName("Apper", QStringList() << "--updates");
++// try QProcess:execute first, KToolInvocation::startServiceByDesktopName seems to not work
++// giving .xsession-errors like: kioexec: Unknown option 'updates'.
++   if ( ! QProcess::execute("apper", QStringList() << "--updates")) {
++        KToolInvocation::startServiceByDesktopName("Apper", QStringList() << "--updates");
++   }
+ }
+ 
+ void UpdateIcon::removeStatusNotifierItem()
diff --git a/apper.spec b/apper.spec
index 7b3902e..34f7649 100644
--- a/apper.spec
+++ b/apper.spec
@@ -5,13 +5,17 @@
 
 Name:    apper
 Version: 0.7.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE interface for PackageKit
 
 License: GPLv2+
 Source0: http://dl.dropbox.com/u/37314029/apper-%{version}.tar.bz2
 URL:     http://kde-apps.org/content/show.php/Apper?content=84745
 
+# KToolInvocation::startServiceByName seems fail(?), 
+# use QProcess::execute like kpk did
+Patch1: apper-0.7.0-systray_actions.patch
+
 ## upstreamable patches
 # fix Exec, Categories
 Patch50: apper-0.7.0-dt_categories.patch
@@ -43,6 +47,7 @@ KDE interface for PackageKit.
 %prep
 %setup -q 
 
+%patch1 -p1 -b .systray_actions
 %patch50 -p1 -b .dt_categories
 
 
@@ -99,6 +104,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt
 
 
 %changelog
+* Wed Oct 19 2011 Rex Dieter <rdieter at fedoraproject.org> 0.7.0-4
+- systray_actions patch/hack
+
 * Mon Oct 17 2011 Rex Dieter <rdieter at fedoraproject.org> 0.7.0-3
 - apper.desktop: Exec=apper %F (not %U, it only handles files, not urls)