From c00478bbc1001d10dcfc04e9b0ea251620837e85 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Mon, 21 Jan 2008 19:08:52 +0000
Subject: Revert the moving of the action to the DolphinView instance, this
 doesn't work with splitted views. (Each view would need its own action
 collection, but then DolphinView would have to become a KXMLGUIClient, and
 the GUI would flicker when switching views).

Instead, use the same solution as the other shared actions: static method in DolphinView (for now),
slot in the mainwindow (and for the more complex actions than this one, shared code in DolphinView)

svn path=/branches/KDE/4.0/kdebase/apps/; revision=764429
---
 src/dolphinviewcontainer.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/dolphinviewcontainer.cpp')

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index b9caa7b8e..a1846dc75 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -115,8 +115,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                              url,
                              m_dirLister,
                              m_dolphinModel,
-                             m_proxyModel,
-                             mainWindow->actionCollection());
+                             m_proxyModel);
     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(const KUrl&)));
     connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)),
-- 
cgit v1.3