Merge branch 'KDE/4.13'

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e6b9112091f466004453c28d20fd5318afeba685..0ad224cbcae2760abcf1559557cbd9cbae4653d0 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -217,6 +217,7 @@ DolphinMainWindow::DolphinMainWindow() :
         toggleSplitView();
     }
     updateEditActions();
         toggleSplitView();
     }
     updateEditActions();

+    updatePasteAction();

     updateViewActions();
     updateGoActions();
 
     updateViewActions();
     updateGoActions();
 


@@ -356,6 +357,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
     if (view) {
         view->setUrl(url);
         updateEditActions();
     if (view) {
         view->setUrl(url);
         updateEditActions();

+        updatePasteAction();

         updateViewActions();
         updateGoActions();
         setUrlAsCaption(url);
         updateViewActions();
         updateGoActions();
         setUrlAsCaption(url);


@@ -1455,6 +1457,7 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
 
     updateHistory();
     updateEditActions();
 
     updateHistory();
     updateEditActions();

+    updatePasteAction();

     updateViewActions();
     updateGoActions();
 
     updateViewActions();
     updateGoActions();
 


@@ -1819,7 +1822,6 @@ void DolphinMainWindow::updateEditActions()
         deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash);
         cutAction->setEnabled(capabilities.supportsMoving());
     }
         deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash);
         cutAction->setEnabled(capabilities.supportsMoving());
     }

-    updatePasteAction();

 }
 
 void DolphinMainWindow::updateViewActions()
 }
 
 void DolphinMainWindow::updateViewActions()