Use global config.
svn path=/trunk/KDE/kdebase/workspace/; revision=477214
This commit is contained in:
parent
816c529a2c
commit
6f43a37012
1 changed files with 5 additions and 4 deletions
9
main.cpp
9
main.cpp
|
@ -84,10 +84,11 @@ Application::Application( )
|
||||||
: KApplication( ), owner( screen_number )
|
: KApplication( ), owner( screen_number )
|
||||||
{
|
{
|
||||||
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
|
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
|
||||||
if (!config()->isImmutable() && args->isSet("lock"))
|
KConfig *config = KGlobal::config();
|
||||||
|
if (!config->isImmutable() && args->isSet("lock"))
|
||||||
{
|
{
|
||||||
config()->setReadOnly(true);
|
config->setReadOnly(true);
|
||||||
config()->reparseConfiguration();
|
config->reparseConfiguration();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (screen_number == -1)
|
if (screen_number == -1)
|
||||||
|
@ -101,7 +102,7 @@ Application::Application( )
|
||||||
connect( &owner, SIGNAL( lostOwnership()), SLOT( lostSelection()));
|
connect( &owner, SIGNAL( lostOwnership()), SLOT( lostSelection()));
|
||||||
|
|
||||||
// if there was already kwin running, it saved its configuration after loosing the selection -> reread
|
// if there was already kwin running, it saved its configuration after loosing the selection -> reread
|
||||||
config()->reparseConfiguration();
|
config->reparseConfiguration();
|
||||||
|
|
||||||
initting = TRUE; // startup....
|
initting = TRUE; // startup....
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue