viewproperties: Fix leaking file descriptors

[dolphin.git] / src / dbusinterface.cpp

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index cf1ad53ad0c56b0e8f9ecee25bbb46604f0f427e..18544493c386dd90f4791794b72b0026e114804a 100644 (file)
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -5,60 +5,72 @@
  */
 
 #include "dbusinterface.h"
  */
 
 #include "dbusinterface.h"

-#include "global.h"

 #include "dolphin_generalsettings.h"
 #include "dolphin_generalsettings.h"

+#include "global.h"

 
 #include <KPropertiesDialog>
 
 #include <KPropertiesDialog>

+#include <KWindowSystem>

 
 

-#include <QApplication>

 #include <QDBusConnection>
 #include <QDBusConnection>

-#include <QDBusInterface>

 #include <QDBusConnectionInterface>
 
 #include <QDBusConnectionInterface>
 

-DBusInterface::DBusInterface() :
-    QObject()
+DBusInterface::DBusInterface()
+    : QObject()

 {
 {

-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"), this,
-            QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
-    QDBusConnection::sessionBus().interface()->registerService(QStringLiteral("org.freedesktop.FileManager1"),
-                                                               QDBusConnectionInterface::QueueService);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"),
+                                                 this,
+                                                 QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
+    QDBusConnectionInterface *sessionInterface = QDBusConnection::sessionBus().interface();
+    if (sessionInterface) {
+        sessionInterface->registerService(QStringLiteral("org.freedesktop.FileManager1"), QDBusConnectionInterface::QueueService);
+    }

 }
 
 }
 

-void DBusInterface::ShowFolders(const QStringList& uriList, const QString& startUpId)
+void DBusInterface::ShowFolders(const QStringList &uriList, const QString &startUpId)

 {
 {

-    Q_UNUSED(startUpId)

     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }
     const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }
     const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());

-    if(!Dolphin::attachToExistingInstance(urls, false, GeneralSettings::splitView(), serviceName)) {
+    if (!Dolphin::attachToExistingInstance(urls, false, GeneralSettings::splitView(), serviceName, startUpId)) {

         Dolphin::openNewWindow(urls);
     }
 }
 
         Dolphin::openNewWindow(urls);
     }
 }
 

-void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)
+void DBusInterface::ShowItems(const QStringList &uriList, const QString &startUpId)

 {
 {

-    Q_UNUSED(startUpId)

     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }
     const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }
     const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());

-    if(!Dolphin::attachToExistingInstance(urls, true, GeneralSettings::splitView(), serviceName)) {
+    if (!Dolphin::attachToExistingInstance(urls, true, GeneralSettings::splitView(), serviceName, startUpId)) {

         Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select);
     };
 }
 
         Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select);
     };
 }
 

-void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId)
+void DBusInterface::ShowItemProperties(const QStringList &uriList, const QString &startUpId)

 {
 {

-    Q_UNUSED(startUpId)

     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (!urls.isEmpty()) {
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (!urls.isEmpty()) {

+        KWindowSystem::setCurrentXdgActivationToken(startUpId);

         KPropertiesDialog::showDialog(urls);
     }
 }
 
         KPropertiesDialog::showDialog(urls);
     }
 }
 

+void DBusInterface::SortOrderForUrl(const QString &url, QString &role, QString &order)
+{
+    QUrl qurl(url);
+    auto sort = Dolphin::sortOrderForUrl(qurl);
+    role = sort.first;
+    if (sort.second == Qt::AscendingOrder) {
+        order = QStringLiteral("ascending");
+    } else {
+        order = QStringLiteral("descending");
+    }
+}
+

 void DBusInterface::setAsDaemon()
 {
     m_isDaemon = true;
 void DBusInterface::setAsDaemon()
 {
     m_isDaemon = true;


@@ -68,3 +80,5 @@ bool DBusInterface::isDaemon() const
 {
     return m_isDaemon;
 }
 {
     return m_isDaemon;
 }

+
+#include "moc_dbusinterface.cpp"