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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase
From:       Stephan Binner <binner () kde ! org>
Date:       2007-07-16 11:56:07
Message-ID: 1184586967.034740.4510.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 688602 by binner:

ensure that kcmshell matching the running KDE version is called


 M  +1 -1      kcontrol/kcontrol/modules.cpp  
 M  +1 -1      khelpcenter/kcmhelpcenter.cpp  


--- branches/KDE/3.5/kdebase/kcontrol/kcontrol/modules.cpp #688601:688602
@@ -191,7 +191,7 @@
       // We also don't have a way to close the module in that case.
       *_rootProcess << "--n"; // Don't keep password.
       if (kdeshell) {
-         *_rootProcess << QString("kcmshell %1 --embed %2 --lang \
%3").arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language()); +        \
*_rootProcess << QString("%1 %2 --embed %3 --lang %4").arg(locate("exe", \
"kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language());  \
}  else {
          *_rootProcess << QString("%1 --embed %2 --lang \
                %3").arg(cmd).arg(_embedWidget->winId()).arg( \
                KGlobal::locale()->language() );
--- branches/KDE/3.5/kdebase/khelpcenter/kcmhelpcenter.cpp #688601:688602
@@ -471,7 +471,7 @@
     kdDebug() << "Run as root" << endl;
   }
 
-  *mProcess << "khc_indexbuilder";
+  *mProcess << locate("exe", "khc_indexbuilder");
   *mProcess << mCmdFile->name();
   *mProcess << Prefs::indexDirectory();
 


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