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

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

SVN commit 688594 by binner:

ensure that kcmshell matching the running KDE version is called


 M  +1 -1      kio/kfile/kfilesharedlg.cpp  
 M  +2 -2      kutils/kcmoduleproxy.cpp  


--- branches/KDE/3.5/kdelibs/kio/kfile/kfilesharedlg.cpp #688593:688594
@@ -204,7 +204,7 @@
     if (d->m_configProc) return;
 
     d->m_configProc = new KProcess(this);
-    (*d->m_configProc) << KStandardDirs::findExe("kdesu") << "kcmshell" << \
"fileshare"; +    (*d->m_configProc) << KStandardDirs::findExe("kdesu") << \
locate("exe", "kcmshell") << "fileshare";  if (!d->m_configProc->start( \
KProcess::NotifyOnExit ))  {
        delete d->m_configProc;
--- branches/KDE/3.5/kdelibs/kutils/kcmoduleproxy.cpp #688593:688594
@@ -363,8 +363,8 @@
 		*d->rootProcess << kdesu;
 		*d->rootProcess << "--nonewdcop" << "-n" << "-d" << QString( "-i%1" \
).arg(moduleInfo().icon());  
-		*d->rootProcess << QString("kcmshell %1 --embed-proxy %2 --lang \
                %3").arg(cmd).arg
-			(d->embedWidget->winId()).arg(KGlobal::locale()->language());
+		*d->rootProcess << QString("%1 %2 --embed-proxy %3 --lang \
%4").arg(locate("exe", "kcmshell")) \
+			.arg(cmd).arg(d->embedWidget->winId()).arg(KGlobal::locale()->language());
  
 		connect(d->rootProcess, SIGNAL(processExited(KProcess*)), \
SLOT(rootExited()));  


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