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

List:       kde-commits
Subject:    kdebase/kdesktop
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-01-19 14:11:23
Message-ID: 20050119141123.8B6BD1BBC1 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

give the kconfigxt object the correct filename
BUG: 96311


  M +1 -1      kdesktop.kcfg   1.8
  M +2 -0      main.cc   1.95
  M +4 -0      lock/main.cc   1.12


--- kdebase/kdesktop/kdesktop.kcfg  #1.7:1.8
@@ -4,5 +4,5 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                            http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile />
+  <kcfgfile arg="true" />
 
   <group name="Background Common"> 

--- kdebase/kdesktop/main.cc  #1.94:1.95
@@ -35,4 +35,5 @@
 #include "init.h"
 #include "krootwm.h"
+#include "kdesktopsettings.h"
 
 #include <signal.h>
@@ -158,4 +159,5 @@ extern "C" KDE_EXPORT int kdemain( int a
     app.disableSessionManagement(); // Do SM, but don't restart.
 
+    KDesktopSettings::instance(appname + "rc");
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 

--- kdebase/kdesktop/lock/main.cc  #1.11:1.12
@@ -21,4 +21,5 @@
 #include "lockprocess.h"
 #include "main.h"
+#include "kdesktopsettings.h"
 
 #include <kcmdlineargs.h>
@@ -136,4 +137,7 @@ int main( int argc, char **argv )
     app.disableSessionManagement();
 
+    // we need to read from the right rc file - possibly taking screen number in account
+    KDesktopSettings::instance("kdesktoprc");
+
     LockProcess process(child, args->isSet( "blank" ));
     if (!child)


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