From b76b1c77be200ca3770b9b703ae5131749f02cb8 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 19 Aug 2010 16:24:55 +0200
Subject: Simpler than I thought, fix kget integration

---
 src/settings/generalwidget.cpp | 2 --
 src/urlbar/urlbar.cpp          | 3 ++-
 src/webpage.cpp                | 2 +-
 src/webview.cpp                | 3 ++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/settings/generalwidget.cpp b/src/settings/generalwidget.cpp
index 94f8b9c6..642813ae 100644
--- a/src/settings/generalwidget.cpp
+++ b/src/settings/generalwidget.cpp
@@ -92,8 +92,6 @@ void GeneralWidget::checkKGetPresence()
 {
     if (KStandardDirs::findExe("kget").isNull())
     {
-        ReKonfig::setKgetDownload(false);
-        ReKonfig::setKgetList(false);
         kcfg_kgetDownload->setDisabled(true);
         kcfg_kgetList->setDisabled(true);
         kcfg_kgetDownload->setToolTip(i18n("Install KGet to enable rekonq to use KGet as download manager"));
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 0d130b94..e64959bd 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -46,6 +46,7 @@
 
 // KDE Includes
 #include <KCompletionBox>
+#include <KStandardDirs>
 
 // Qt Includes
 #include <QtGui/QPainter>
@@ -321,7 +322,7 @@ void UrlBar::loadFinished()
     }
         
     // show KGet downloads??
-    if (ReKonfig::kgetList())
+    if (!KStandardDirs::findExe("kget").isNull() && ReKonfig::kgetList())
     {
         IconButton *bt = addRightIcon(UrlBar::KGet);
         connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(downloadAllContentsWithKGet(QPoint)));
diff --git a/src/webpage.cpp b/src/webpage.cpp
index ea2add6d..8221626e 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -139,7 +139,7 @@ static bool downloadResource (const KUrl& srcUrl, const KIO::MetaData& metaData
     // Save download history
     Application::instance()->addDownload(srcUrl.pathOrUrl() , destUrl.pathOrUrl());
 
-    if (ReKonfig::kgetDownload())
+    if (!KStandardDirs::findExe("kget").isNull() && ReKonfig::kgetDownload())
     {
         //KGet integration:
         if (!QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.kget"))
diff --git a/src/webview.cpp b/src/webview.cpp
index b710719f..c15478c2 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -47,6 +47,7 @@
 #include <KMenu>
 #include <KActionMenu>
 #include <ktoolinvocation.h>
+#include <KStandardDirs>
 
 // Qt Includes
 #include <QtCore/QDir>
@@ -316,7 +317,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
 
             menu.addAction(mainwindow->actionByName(KStandardAction::name(KStandardAction::SaveAs)));
 
-            if (ReKonfig::kgetList())
+            if (!KStandardDirs::findExe("kget").isNull() && ReKonfig::kgetList())
             {
                 a = new KAction(KIcon("kget"), i18n("List All Links"), this);
                 connect(a, SIGNAL(triggered(bool)), page(), SLOT(downloadAllContentsWithKGet()));
-- 
cgit v1.2.1