From b71636fb5bfd341c663a5187a6076425b5f118b1 Mon Sep 17 00:00:00 2001
From: Script Kiddy <scripty@kde.org>
Date: Tue, 22 Nov 2011 21:19:16 +0100
Subject: [PATCH 1/4] SVN_SILENT made messages (.desktop file)

---
 data/servicetypes/plasma-scriptengine.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/servicetypes/plasma-scriptengine.desktop b/data/servicetypes/plasma-scriptengine.desktop
index b15de8fbd..97e3210ef 100644
--- a/data/servicetypes/plasma-scriptengine.desktop
+++ b/data/servicetypes/plasma-scriptengine.desktop
@@ -24,7 +24,7 @@ Comment[fi]=Skriptauskielituki Plasmalle
 Comment[fr]=Langage de script d'extension pour Plasma
 Comment[fy]=Scripting taal taheaksel foar Plasma
 Comment[ga]=Eisínteacht teanga scriptithe le haghaidh Plasma
-Comment[gl]=Engadido de linguaxe de scripts para o Plasma
+Comment[gl]=Extensión de linguaxe de scripts para o Plasma
 Comment[gu]=પ્લાઝમા માટે સ્ક્રિપ્ટીંગ ભાષા એક્સટેન્શન
 Comment[he]=הרחבת שפת תסריטים של Plasma
 Comment[hne]=प्लाज्मा बर स्क्रिप्टिंग भाखा

From 2f5d8e4e7f18a3ca8202369c4e468b70c1db8d3a Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Mon, 28 Nov 2011 09:42:35 +0100
Subject: [PATCH 2/4] the graphics widget may not have been into a layout, or
 may be null

BUG:287548
---
 popupapplet.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/popupapplet.cpp b/popupapplet.cpp
index 831b99eea..c36350323 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -172,10 +172,12 @@ void PopupApplet::setGraphicsWidget(QGraphicsWidget *graphicsWidget)
     if (d->graphicsWidget) {
         if (d->dialogPtr) {
             d->dialogPtr.data()->setGraphicsWidget(graphicsWidget);
-        } else {
+        } else if (layout())  {
             QGraphicsLinearLayout *lay = static_cast<QGraphicsLinearLayout *>(layout());
             lay->removeAt(0);
-            lay->addItem(graphicsWidget);
+            if (graphicsWidget) {
+                lay->addItem(graphicsWidget);
+            }
         }
     }
 

From e500cd4bd7034f3ba3cd383278528ef9f935971b Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Mon, 28 Nov 2011 10:37:21 +0100
Subject: [PATCH 3/4] make removeAllSources match removeSource closer

---
 dataengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dataengine.cpp b/dataengine.cpp
index c33b10332..e6b115324 100644
--- a/dataengine.cpp
+++ b/dataengine.cpp
@@ -331,10 +331,10 @@ void DataEngine::removeAllSources()
     while (it.hasNext()) {
         it.next();
         Plasma::DataContainer *s = it.value();
-        emit sourceRemoved(it.key());
         it.remove();
         s->disconnect(this);
-        delete s;
+        s->deleteLater();
+        emit sourceRemoved(it.key());
     }
 }
 

From e7ffcacf1fd3dd7896745b70cc5d368907f8a109 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Mon, 28 Nov 2011 10:42:40 +0100
Subject: [PATCH 4/4] emit sourceRemoved when the container is deleted outside
 of removeSource

---
 dataengine.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dataengine.cpp b/dataengine.cpp
index e6b115324..9ad22efed 100644
--- a/dataengine.cpp
+++ b/dataengine.cpp
@@ -681,6 +681,7 @@ void DataEnginePrivate::sourceDestroyed(QObject *object)
     while (it != sources.end()) {
         if (it.value() == object) {
             sources.erase(it);
+            emit q->sourceRemoved(object->objectName());
             break;
         }
         ++it;