From 74ab090b72cfc262cc6a42502dc19a8f4566db1a Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 16 Feb 2010 06:46:39 +0000
Subject: [PATCH] in case a script engine does not add the standard pages
 (which is a bug in the script engine), at least don't crash BUG:226823

svn path=/trunk/KDE/kdelibs/; revision=1090827
---
 applet.cpp | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/applet.cpp b/applet.cpp
index 056c089a0..fe926578d 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -1706,6 +1706,7 @@ void Applet::showConfigurationInterface()
         return;
     }
 
+    d->publishUI.publishCheckbox = 0;
     if (d->package && d->configLoader) {
         KConfigDialog *dialog = 0;
 
@@ -1872,29 +1873,31 @@ void AppletPrivate::configDialogFinished()
     }
 
 #ifdef ENABLE_REMOTE_WIDGETS
-    q->config().writeEntry("Share", publishUI.publishCheckbox->isChecked());
+    if (publishUI.publishCheckbox) {
+        q->config().writeEntry("Share", publishUI.publishCheckbox->isChecked());
 
-    if (publishUI.publishCheckbox->isChecked()) {
-        QString resourceName =
-        i18nc("%1 is the name of a plasmoid, %2 the name of the machine that plasmoid is published on",
-              "%1 on %2", q->name(), QHostInfo::localHostName());
-        q->publish(Plasma::ZeroconfAnnouncement, resourceName);
-        if (publishUI.allUsersCheckbox->isChecked()) {
-            if (!AuthorizationManager::self()->d->matchingRule(resourceName, Credentials())) {
-                AuthorizationRule *rule = new AuthorizationRule(resourceName, "");
-                rule->setPolicy(AuthorizationRule::Allow);
-                rule->setTargets(AuthorizationRule::AllUsers);
-                AuthorizationManager::self()->d->rules.append(rule);
+        if (publishUI.publishCheckbox->isChecked()) {
+            QString resourceName =
+                i18nc("%1 is the name of a plasmoid, %2 the name of the machine that plasmoid is published on",
+                        "%1 on %2", q->name(), QHostInfo::localHostName());
+            q->publish(Plasma::ZeroconfAnnouncement, resourceName);
+            if (publishUI.allUsersCheckbox->isChecked()) {
+                if (!AuthorizationManager::self()->d->matchingRule(resourceName, Credentials())) {
+                    AuthorizationRule *rule = new AuthorizationRule(resourceName, "");
+                    rule->setPolicy(AuthorizationRule::Allow);
+                    rule->setTargets(AuthorizationRule::AllUsers);
+                    AuthorizationManager::self()->d->rules.append(rule);
+                }
+            } else {
+                AuthorizationRule *matchingRule =
+                    AuthorizationManager::self()->d->matchingRule(resourceName, Credentials());
+                if (matchingRule) {
+                    AuthorizationManager::self()->d->rules.removeAll(matchingRule);
+                }
             }
         } else {
-            AuthorizationRule *matchingRule =
-                AuthorizationManager::self()->d->matchingRule(resourceName, Credentials());
-            if (matchingRule) {
-                AuthorizationManager::self()->d->rules.removeAll(matchingRule);
-            }
+            q->unpublish();
         }
-    } else {
-        q->unpublish();
     }
 #endif