rpms/sentinella/devel sentinella-0.6.2-fix_close-method.patch, NONE, 1.1 sentinella-0.6.2-fix_leak-on-errors.patch, NONE, 1.1 sentinella.spec, 1.5, 1.6

[thomasj]

Author: thomasj

Update of /cvs/pkgs/rpms/sentinella/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28133

Modified Files:
	sentinella.spec 
Added Files:
	sentinella-0.6.2-fix_close-method.patch 
	sentinella-0.6.2-fix_leak-on-errors.patch 
Log Message:
added two patches, fix_close-method, fix_leak-on-errors

sentinella-0.6.2-fix_close-method.patch:
 MainWindow.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sentinella-0.6.2-fix_close-method.patch ---
--- src/MainWindow.cpp	2010-05-29 15:25:23.000000000 +0200
+++ src/MainWindow.cpp.old	2010-06-21 20:58:39.000000000 +0200
@@ -165,7 +165,7 @@
 			gui.labelProcessDies->setText(QString::fromAscii(procInfo.filename));
 		}
 #ifdef SA_CLOSE_PROCESS
-		sa_close_cpu();
+		sa_close_process();
 #endif
 	}
 }
@@ -251,7 +251,7 @@
 			gui.labelKillProcess->setText(QString::fromAscii(procInfo.filename));
 		}
 #ifdef SA_CLOSE_PROCESS
-		sa_close_cpu();
+		sa_close_process();
 #endif
 	}
 

sentinella-0.6.2-fix_leak-on-errors.patch:
 AbstractLoopCondition.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sentinella-0.6.2-fix_leak-on-errors.patch ---
--- src/Conditions/AbstractLoopCondition.cpp	2010-04-05 01:09:27.000000000 +0200
+++ src/Conditions/AbstractLoopCondition.cpp.old	2010-06-21 21:10:16.000000000 +0200
@@ -44,8 +44,8 @@
 			break;
 
 		result = evaluate();
-		if (error) // If there was an error we should not try to close()
-			return;
+		if (error)
+			break;
 		if (result)
 			i += step;
 		else


Index: sentinella.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sentinella/devel/sentinella.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sentinella.spec	20 Jun 2010 19:59:25 -0000	1.5
+++ sentinella.spec	21 Jun 2010 19:17:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           sentinella
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Monitors your system activity and takes chosen action
 
 Group:          Applications/System
@@ -15,6 +15,8 @@ BuildRequires:	kdebase-workspace-devel g
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 Patch20:	sentinella-fix-DSO.patch
+Patch30:	sentinella-0.6.2-fix_close-method.patch
+Patch40:	sentinella-0.6.2-fix_leak-on-errors.patch
 
 %description
 Application that monitors your system activity and, when a condition is met, 
@@ -29,6 +31,8 @@ Sentinella integrates perfectly with KDE
 %prep
 %setup -q -n Sentinella-%{version}
 %patch20 -p0
+%patch30 -p0
+%patch40 -p0
 
 ## to prevent spurious-executable-perm in -debuginfo
 chmod -x src/Actions/Sleep.h
@@ -84,6 +88,10 @@ update-desktop-database -q &> /dev/null
 %{_kde4_datadir}/applications/kde4/Sentinella.desktop
 
 %changelog
+* Mon Jun 21 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.6.2-2
+- fix_close-method.patch
+- fix_leak-on-errors.patch
+
 * Sun Jun 20 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.6.2-1
 - sentinella 0.6.2 bugfixes and new translations