diff options
| author | Timothy Pearson <[email protected]> | 2014-10-06 12:16:27 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-06 12:16:27 -0500 |
| commit | ecd088049d4aa2e8262f4cc1e0ac45e135964229 (patch) | |
| tree | 49ed22e9e7852fd3f26854aecf41c96169d59629 /redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch | |
| parent | 855439d3f99b0c152c33ae76a06cce9853f9b8dd (diff) | |
| parent | 01a7863524342e1aec31679e55d08830cc571066 (diff) | |
| download | tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.tar.gz tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch')
| -rw-r--r-- | redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch b/redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch deleted file mode 100644 index 1a80c00f1..000000000 --- a/redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 ))) |