[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kdesktop
From:       Laurent Montel <montel () kde ! org>
Date:       2005-10-07 11:52:15
Message-ID: 1128685935.718129.26696.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 468191 by mlaurent:

Fix erro


 M  +2 -1      krootwm.cc  
 M  +1 -1      main.cc  


--- trunk/KDE/kdebase/kdesktop/krootwm.cc #468190:468191
@@ -65,6 +65,7 @@
 #include <QDesktopWidget>
 #include <Q3IconView>
 #include <kauthorized.h>
+#include <ktoolinvocation.h>
 
 KRootWm * KRootWm::s_rootWm = 0;
 
@@ -731,7 +732,7 @@
   QStringList args = configModules();
   args.prepend(i18n("Desktop"));
   args.prepend("--caption");
-  KApplication::kdeinitExec(QLatin1String("kcmshell"), args);
+  KToolInvocation::kdeinitExec(QLatin1String("kcmshell"), args);
 }
 
 static void sendToAppropriate(const char* baseApp, const char* iface, const char* call)
--- trunk/KDE/kdebase/kdesktop/main.cc #468190:468191
@@ -185,7 +185,7 @@
 
     // Mark kdeskop as immutable if all of its config modules have been disabled
     if (!app.config()->isImmutable() && 
-        KAuthorized::authorizeKActionControlModules(KRootWm::configModules()).isEmpty())
+        KAuthorized::authorizeControlModules(KRootWm::configModules()).isEmpty())
     {
        app.config()->setReadOnly(true);
        app.config()->reparseConfiguration();
[prev in list] [next in list] [prev in thread] [next in thread]