From: Peter Penz <peter.penz19@gmail.com>
Date: Wed, 19 May 2010 18:55:05 +0000 (+0000)
Subject: Disable the automatic error handling in the DolphinDirLister, the error message is... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/91851b436e7c623b54a19f8948b01b4dd28b50cc

Disable the automatic error handling in the DolphinDirLister, the error message is shown in Dolphin instead.

CCBUG: 229505

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

diff --git a/src/dolphindirlister.cpp b/src/dolphindirlister.cpp
index 55be9cd2e..2eac5522d 100644
--- a/src/dolphindirlister.cpp
+++ b/src/dolphindirlister.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2009 by Peter Penz <peter.penz@gmx.at>             *
+ *   Copyright (C) 2006-2010 by Peter Penz <peter.penz@gmx.at>             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -24,6 +24,7 @@
 DolphinDirLister::DolphinDirLister() :
     KDirLister()
 {
+    setAutoErrorHandlingEnabled(false, 0);
 }
 
 DolphinDirLister::~DolphinDirLister()
diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 9107828d6..1fa84f4a6 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -34,6 +34,8 @@
 #include <QFile>
 #include <QFileInfo>
 
+#include <kdebug.h>
+
 ViewProperties::ViewProperties(const KUrl& url) :
     m_changedProps(false),
     m_autoSave(true),
@@ -45,7 +47,8 @@ ViewProperties::ViewProperties(const KUrl& url) :
 
     const QLatin1String fileName("/.directory");
 
-    if ((m_filepath.length() < 1) || (!QDir::isAbsolutePath(m_filepath))) {
+    if ((m_filepath.length() < 1) || !QDir::isAbsolutePath(m_filepath)) {
+        kDebug() << "---- using global path: global/.directory";
         const QString file = destinationDir("global") + fileName;
         m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
         return;