GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index c9ec6a1200036caaa1b7e6fb15bb6f516bc7e709..d5fbec6bc47666dda08edfad8f75867c7dbcfd12 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -15,6 +15,7 @@
 #include <KDialogJobUiDelegate>
 #include <KIO/ApplicationLauncherJob>
 #include <KService>
 #include <KDialogJobUiDelegate>
 #include <KIO/ApplicationLauncherJob>
 #include <KService>

+#include <KWindowSystem>

 
 #include <QApplication>
 
 
 #include <QApplication>
 


@@ -56,7 +57,7 @@ void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const Open
     job->start();
 }
 
     job->start();
 }
 

-bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService)
+bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService, const QString &activationToken)

 {
     bool attached = false;
 
 {
     bool attached = false;
 


@@ -121,7 +122,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
                     interface.first->openDirectories(interface.second, splitView);
         reply.waitForFinished();
         if (!reply.isError()) {
                     interface.first->openDirectories(interface.second, splitView);
         reply.waitForFinished();
         if (!reply.isError()) {

-            interface.first->activateWindow();
+            interface.first->activateWindow(activationToken);

             attached = true;
         }
     }
             attached = true;
         }
     }