summaryrefslogtreecommitdiffstats
path: root/redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch
blob: 1a80c00f1233fd1d83e958cd0a9ad53bddefe12f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
commit 1e2983ad0107fb1d26e3e9931528701f30632c6d
Author: Timothy Pearson <[email protected]>
Date:   1326856834 -0600

    Fix kdm_greet high CPU usage
    Clean up a few build warnings

diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index 9b974cc..5877cb6 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -273,6 +273,9 @@ void KGreeter::handleInputPipe(void) {
 		readbuf[numread] = 0;
 		readbuf[2047] = 0;
 		inputcommand += readbuf;
+		if (!tqApp->hasPendingEvents()) {
+			usleep(500);
+		}
 		tqApp->processEvents();
 	}
 	if (closingDown) {
@@ -508,11 +511,11 @@ KGreeter::insertUsers(int limit_users)
                 int count = 0;
 		for (setpwent(); (ps = getpwent()) != 0;) {
 			if (*ps->pw_dir && *ps->pw_shell &&
-			    (ps->pw_uid >= (unsigned)_lowUserId ||
-			     !ps->pw_uid && _showRoot) &&
-			    ps->pw_uid <= (unsigned)_highUserId &&
-			    !noUsers.hasUser( ps->pw_name ) &&
-			    !noUsers.hasGroup( ps->pw_gid ))
+			    ((ps->pw_uid >= (unsigned)_lowUserId) ||
+			     ((!ps->pw_uid) && _showRoot)) &&
+			    (ps->pw_uid <= (unsigned)_highUserId) &&
+			    (!noUsers.hasUser( ps->pw_name )) &&
+			    (!noUsers.hasGroup( ps->pw_gid )))
 			{
 				TQString username( TQFile::decodeName( ps->pw_name ) );
 				if (!dupes.find( username )) {
@@ -574,7 +577,7 @@ KGreeter::insertUsers(int limit_users)
 			for (setpwent(); (ps = getpwent()) != 0;) {
 				if (*ps->pw_dir && *ps->pw_shell &&
 				    (ps->pw_uid >= (unsigned)_lowUserId ||
-				     !ps->pw_uid && _showRoot) &&
+				     ((!ps->pw_uid) && _showRoot)) &&
 				    ps->pw_uid <= (unsigned)_highUserId &&
 				    (users.hasUser( ps->pw_name ) ||
 				     users.hasGroup( ps->pw_gid )))