diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:23 -0600 |
| commit | b6609bb30d91121e98eb2bbe2cf89ff144680e84 (patch) | |
| tree | 5d8a9133155e9e2e9cde60e2cc3670de03ae5d35 /kdesktop | |
| parent | 2242eb95a7bcd686207e2043340fed5ccc8b7609 (diff) | |
| parent | 56a663b7c2cf18978a349015b6e19f1d898e8bb9 (diff) | |
| download | tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.tar.gz tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 2 | ||||
| -rw-r--r-- | kdesktop/main.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index ad075ba22..dc8d4d330 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -231,7 +231,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly) XSelectInput( tqt_xdisplay(), tqt_xrootwin(), SubstructureNotifyMask | rootAttr.your_event_mask ); - // Add non-KDE path + // Add non-TDE path KGlobal::dirs()->addResourceType("scrsav", KGlobal::dirs()->kde_default("apps") + "System/ScreenSavers/"); diff --git a/kdesktop/main.cc b/kdesktop/main.cc index e15596ffb..9a4c52f3c 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -101,7 +101,7 @@ static void signalHandler(int sigId) void KDesktop::slotUpAndRunning() { // Activate crash recovery - if (getenv("KDE_DEBUG") == NULL) + if (getenv("TDE_DEBUG") == NULL) KCrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash } |