SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 5314c24ed845727b16d086629b2d02eacc1d70f4..5c0d43d836fc1244648cf875eb3a84bda822ea04 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -20,22 +20,20 @@
 
 #include "dolphinsettingsdialog.h"
 
-#include <dolphinmainwindow.h>
 #include "dolphin_generalsettings.h"
+#include "dolphinmainwindow.h"
 #include "general/generalsettingspage.h"
 #include "navigation/navigationsettingspage.h"
 #include "services/servicessettingspage.h"
 #include "startup/startupsettingspage.h"
-#include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
+#include "viewmodes/viewsettingspage.h"
 
 #include <KAuthorized>
-#include <KWindowConfig>
 #include <KLocalizedString>
-#include <QIcon>
+#include <KWindowConfig>
 
 #include <QPushButton>
-#include <QDialogButtonBox>
 
 DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     KPageDialog(parent),
@@ -105,7 +103,9 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);
     m_pages.append(servicesSettingsPage);
-    m_pages.append(trashSettingsPage);
+    if (trashSettingsPage) {
+        m_pages.append(trashSettingsPage);
+    }
     m_pages.append(generalSettingsPage);
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");