From 53d2c9970af66fea6712bcf53de08c1768fc3823 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 26 May 2009 18:04:02 +0000
Subject: [PATCH] make a config dialog even if the applet has a package and a
 config.xml but lacks a config.ui

svn path=/trunk/KDE/kdelibs/; revision=973264
---
 applet.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/applet.cpp b/applet.cpp
index 7bf1a3d2d..6bab8695b 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -1535,30 +1535,30 @@ void Applet::showConfigurationInterface()
     }
 
     if (d->package && d->configLoader) {
-        QString uiFile = d->package->filePath("mainconfigui");
-        if (uiFile.isEmpty()) {
-            return;
-        }
-
         KConfigDialog *dialog = new KConfigDialog(0, d->configDialogId(), d->configLoader);
-        dialog->setWindowTitle(d->configWindowTitle());
-        dialog->setAttribute(Qt::WA_DeleteOnClose, true);
 
-        QUiLoader loader;
-        QFile f(uiFile);
-        if (!f.open(QIODevice::ReadOnly)) {
-            delete dialog;
+        QString uiFile = d->package->filePath("mainconfigui");
+        if (!uiFile.isEmpty()) {
+            dialog->setWindowTitle(d->configWindowTitle());
+            dialog->setAttribute(Qt::WA_DeleteOnClose, true);
 
-            if (d->script) {
-                d->script->showConfigurationInterface();
+            QUiLoader loader;
+            QFile f(uiFile);
+            if (!f.open(QIODevice::ReadOnly)) {
+                delete dialog;
+
+                if (d->script) {
+                    d->script->showConfigurationInterface();
+                }
+                return;
             }
-            return;
+
+            QWidget *w = loader.load(&f);
+            f.close();
+
+            dialog->addPage(w, i18n("Settings"), icon(), i18n("%1 Settings", name()));
         }
 
-        QWidget *w = loader.load(&f);
-        f.close();
-
-        dialog->addPage(w, i18n("Settings"), icon(), i18n("%1 Settings", name()));
         d->addGlobalShortcutsPage(dialog);
         connect(dialog, SIGNAL(applyClicked()), this, SLOT(configDialogFinished()));
         connect(dialog, SIGNAL(okClicked()), this, SLOT(configDialogFinished()));