From: Peter Penz <peter.penz19@gmail.com>
Date: Mon, 9 Nov 2009 18:16:30 +0000 (+0000)
Subject: fixed merge issue
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c14e428d943ae558ab3620dce77526b11f8e28e6?ds=inline

fixed merge issue

svn path=/trunk/KDE/kdebase/apps/; revision=1046789
---

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 7b0b66fb0..5844fff81 100644
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -544,10 +544,3 @@ void DolphinViewActionHandler::slotProperties()
     dialog->raise();
     dialog->activateWindow();
 }
-
-void DolphinViewActionHandler::slotGetServiceMenu()
-{
-    KNS::Engine khns(m_currentView);
-    khns.init("servicemenu.knsrc");
-    khns.downloadDialogModal(m_currentView);
-}