forwardport r757231

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 3a1e6f72c29be2d1890506d1611c8708d08fee32..155884bfab5907c166ad6d93d82a90748993017f 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -277,6 +277,14 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
 
 void DolphinPart::slotItemTriggered(const KFileItem& item)
 {
 
 void DolphinPart::slotItemTriggered(const KFileItem& item)
 {

+    KParts::OpenUrlArguments args;
+    args.setMimeType(item.mimetype());
+
+    // Ideally, konqueror should be changed to not require trustedSource for directory views,
+    // since the idea was not to need BrowserArguments for non-browser stuff...
+    KParts::BrowserArguments browserArgs;
+    browserArgs.trustedSource = true;
+

     // MMB click support.
     // TODO: this doesn't work, mouseButtons() is always 0.
     // Issue N176832 for the missing QAIV signal; task 177399
     // MMB click support.
     // TODO: this doesn't work, mouseButtons() is always 0.
     // Issue N176832 for the missing QAIV signal; task 177399


@@ -284,9 +292,7 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
     if (QApplication::mouseButtons() & Qt::MidButton) {
         kDebug() << "MMB!!" << item.mimetype();
         if (item.mimeTypePtr()->is("inode/directory")) {
     if (QApplication::mouseButtons() & Qt::MidButton) {
         kDebug() << "MMB!!" << item.mimetype();
         if (item.mimeTypePtr()->is("inode/directory")) {

-            KParts::OpenUrlArguments args;
-            args.setMimeType( item.mimetype() );
-            emit m_extension->createNewWindow( item.url(), args );
+            emit m_extension->createNewWindow(item.url(), args);

         } else {
             kDebug() << "run()";
             item.run();
         } else {
             kDebug() << "run()";
             item.run();


@@ -294,7 +300,7 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
     } else {
         // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted]
         kDebug() << "LMB";
     } else {
         // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted]
         kDebug() << "LMB";

-        emit m_extension->openUrlRequest(item.url());
+        emit m_extension->openUrlRequest(item.url(), args, browserArgs);

     }
 }
 
     }
 }