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

List:       kde-commits
Subject:    [kdevelop] app: Store full path to kdevelop executable in the x11
From:       Alexander Dymo <adymo () kdevelop ! org>
Date:       2011-09-22 8:39:05
Message-ID: 20110922083905.BA9CEA607A () git ! kde ! org
[Download RAW message or body]

Git commit d85fe1312688d0f0bd4339faeb80165a8d02e794 by Alexander Dymo.
Committed on 22/09/2011 at 10:35.
Pushed by dymo into branch 'master'.

Store full path to kdevelop executable in the x11 session restore command.
If you have two or more kdevelop's installed (for example, self-compiled in home dir
and distribution-provided in /usr), session restoration will launch the
version you actually used. Before it would launch only the one in /usr.

M  +1    -1    app/main.cpp

http://commits.kde.org/kdevelop/d85fe1312688d0f0bd4339faeb80165a8d02e794

diff --git a/app/main.cpp b/app/main.cpp
index dace359..89d67a4 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -76,7 +76,7 @@ public:
 
     void saveState( QSessionManager& sm ) {
         if (KDevelop::Core::self() && KDevelop::Core::self()->sessionController())
-            sm.setRestartCommand(QStringList() << "kdevelop" << "-s" << \
KDevelop::Core::self()->sessionController()->activeSession()->id().toString()); +     \
sm.setRestartCommand(QStringList() << QCoreApplication::applicationFilePath() << "-s" \
<< KDevelop::Core::self()->sessionController()->activeSession()->id().toString());  \
KApplication::saveState(sm);  }
 };


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