diff options
| author | Darrell Anderson <[email protected]> | 2013-01-12 16:16:03 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-01-12 16:16:03 -0600 |
| commit | 2c10a4aac71b1e66d4e3fc0c9401e8b283e73be3 (patch) | |
| tree | 15402a6a50f4dc5409f5fa3caf29ebd0d3c2dd21 /kutils | |
| parent | 01e9b41e1b0412e7281e9ef5c0df586bb66d8763 (diff) | |
| parent | 4c9ff70f806c4e8f2f6197b94db39b5bef8c71f2 (diff) | |
| download | tdelibs-2c10a4aac71b1e66d4e3fc0c9401e8b283e73be3.tar.gz tdelibs-2c10a4aac71b1e66d4e3fc0c9401e8b283e73be3.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kutils')
| -rw-r--r-- | kutils/kcmoduleproxy.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index e0074defe..2323cd262 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -195,9 +195,10 @@ KCModule * KCModuleProxy::realModule() const d->topLayout->addWidget( d->kcm ); - if ( !d->rootInfo && /* If it's already done */ - moduleInfo().needsRootPrivileges() /* root, anyone? */ && - !KUser().isSuperUser() ) /* Not necessary if we're root */ + if ( !d->rootInfo && /* If the message was not yet created */ + d->kcm->useRootOnlyMsg() /* and the module requests the message */ && + moduleInfo().needsRootPrivileges() /* and the module wants root access */ && + !KUser().isSuperUser() ) /* and we are not currently root */ { d->rootInfo = new TQLabel( that, "rootInfo" ); |