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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2006-09-26 10:39:26
Message-ID: 1159267166.259310.16908.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 588539 by lunakl:

Make sure KInstance::dirs() returns also customized dirs.



 M  +3 -1      kdecore/kinstance.cpp  
 M  +4 -2      kinit/kinit.cpp  


--- branches/KDE/3.5/kdelibs/kdecore/kinstance.cpp #588538:588539
@@ -161,9 +161,11 @@
     DEBUG_CHECK_ALIVE
     if( _dirs == 0 ) {
 	_dirs = new KStandardDirs( );
-        if (_config)
+        if (_config) {
             if (_dirs->addCustomized(_config))
                 _config->reparseConfiguration();
+	} else
+            config(); // trigger adding of possible customized dirs
     }
 
     return _dirs;
--- branches/KDE/3.5/kdelibs/kinit/kinit.cpp #588538:588539
@@ -1752,13 +1752,15 @@
 
    /** Create our instance **/
    s_instance = new KInstance("kdeinit");
-   // Don't make it the global instance
-   KGlobal::_instance = 0L;
 
    /** Prepare to change process name **/
    kdeinit_initsetproctitle(argc, argv, envp);
    kdeinit_setproctitle("kdeinit Starting up...");
    kdeinit_library_path();
+   // Don't make our instance the global instance
+   // (do it only after kdeinit_library_path, that one indirectly uses KConfig,
+   // which seems to be buggy and always use KGlobal instead of the maching KInstance)
+   KGlobal::_instance = 0L;
    // don't change envvars before kdeinit_initsetproctitle()
    unsetenv("LD_BIND_NOW");
    unsetenv("DYLD_BIND_AT_LAUNCH");
[prev in list] [next in list] [prev in thread] [next in thread]