assure that when switching the view mode from a column view to another view, that...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ebc0bd43efd6856d0ad1e69a7c468ac4ae4e52ab..0dc26b63b3bb99dbbdaf8b0fac735429a3cedd40 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphinmainwindow.h"
 
-#include <config-kmetadata.h>
+#include "config-nepomuk.h"
 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
@@ -779,7 +779,9 @@ void DolphinMainWindow::toggleSplitView()
         m_viewContainer[SecondaryIdx]->deleteLater();
         m_viewContainer[SecondaryIdx] = 0;
     }
+
     setActiveView(m_viewContainer[PrimaryIdx]);
+    updateViewActions();
     emit activeViewChanged();
 }
 
@@ -998,7 +1000,7 @@ void DolphinMainWindow::init()
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }
-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK
     if (!MetaDataWidget::metaDataAvailable())
         activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
 #endif