rpms/kdebase-runtime/F-11 kdebase-runtime-4.2.2-persistent_notify.patch, NONE, 1.1 kdebase-runtime.spec, 1.109, 1.110

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13983/F-11

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.2-persistent_notify.patch 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
- fix persistent systray notifications


kdebase-runtime-4.2.2-persistent_notify.patch:

--- NEW FILE kdebase-runtime-4.2.2-persistent_notify.patch ---
diff -up kdebase/runtime/knotify/notifybypopup.cpp.rex kdebase/runtime/knotify/notifybypopup.cpp
--- kdebase/runtime/knotify/notifybypopup.cpp.rex	2009-04-16 14:56:26.000000000 -0500
+++ kdebase/runtime/knotify/notifybypopup.cpp	2009-04-16 14:59:07.000000000 -0500
@@ -353,19 +353,6 @@ void NotifyByPopup::sendNotificationDBus
 	QString timeoutStr = config->readEntry( "Timeout" );
 	int timeout = !timeoutStr.isEmpty() ? timeoutStr.toInt() : 0;
 
-	// if timeout is still zero, try to set it to default knotify timeout
-	if (timeout == 0) {
-		// NOTE: this is a little hack. Currently there's no way to easily determine
-		// if KNotify will close notification after certain timeout or if it's persistent.
-		// The only thing that comes to mind is to check Persistent option in config and
-		// if it's absent, use default timeout that KNotify uses for non-persistent popups
-		bool persistent = (config->readEntry("Persistent") == "true" ||
-						   config->readEntry("Persistant") == "true");
-		if (!persistent) {
-			timeout = 6*1000;
-		}
-    }
-
 	QList<QVariant> args;
 
 	// figure out dbus id to replace if needed


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- kdebase-runtime.spec	1 Apr 2009 15:29:42 -0000	1.109
+++ kdebase-runtime.spec	17 Apr 2009 00:24:55 -0000	1.110
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -23,6 +23,7 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
+Patch100:       kdebase-runtime-4.2.2-persistent_notify.patch
 
 #ifarch noarch
 ## icons now provided by standalone oxygen-icon-theme
@@ -127,6 +128,8 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p2 -b .persistent_knotify
+
 
 %build
 mkdir -p %{_target_platform}
@@ -386,6 +389,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- fix persistent systray notifications
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - -flags subpkg
 - koji/noarch hacks dropped