From 8bd7159ebc428d288cd68e18aa557db0f31bb5b4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 30 Jan 2014 06:49:57 +0000
Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file)

---
 effects/blur/blur.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/blur/blur.desktop b/effects/blur/blur.desktop
index 16a6ef6069..58d87854fa 100644
--- a/effects/blur/blur.desktop
+++ b/effects/blur/blur.desktop
@@ -96,7 +96,7 @@ Comment[de]=Verwischt den Hintergrund halbtransparenter Fenster.
 Comment[el]=Θόλωμα του φόντου πίσω από ημιδιαφανή παράθυρα
 Comment[en_GB]=Blurs the background behind semi-transparent windows
 Comment[eo]=Malklarigas la fonon de duon-travideblaj fenestroj
-Comment[es]=Desenfoca el fondo de una ventana semi-transparente
+Comment[es]=Desenfoca el fondo de una ventana semitransparente
 Comment[et]=Poolläbipaistvate akende tausta hägustamine
 Comment[eu]=Atzeko planoa lausotzen du leiho erdi-gardenen atzean
 Comment[fi]=Sumentaa puoliksi läpinäkyvien ikkunoiden taustan

From 34ecf8970ef17bc2755decc2b32a51cd367c413d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Sun, 24 Nov 2013 18:36:14 +0100
Subject: [PATCH 2/3] mouseclick FX, don't collect clicks unless active

BUG: 328010
FIXED-IN: 4.11.6
REVIEW: 115389
---
 effects/mouseclick/mouseclick.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/effects/mouseclick/mouseclick.cpp b/effects/mouseclick/mouseclick.cpp
index 99b9303fcc..b614d32c61 100644
--- a/effects/mouseclick/mouseclick.cpp
+++ b/effects/mouseclick/mouseclick.cpp
@@ -49,8 +49,6 @@ MouseClickEffect::MouseClickEffect()
     a->setText(i18n("Toggle Effect"));
     a->setGlobalShortcut(KShortcut(Qt::META + Qt::Key_Asterisk));
     connect(a, SIGNAL(triggered(bool)), this, SLOT(toggleEnabled()));
-    connect(effects, SIGNAL(mouseChanged(QPoint,QPoint,Qt::MouseButtons,Qt::MouseButtons,Qt::KeyboardModifiers,Qt::KeyboardModifiers)),
-            this, SLOT(slotMouseChanged(QPoint,QPoint,Qt::MouseButtons,Qt::MouseButtons,Qt::KeyboardModifiers,Qt::KeyboardModifiers)));
     reconfigure(ReconfigureAll);
 
     m_buttons[0] = new MouseButton(i18n("Left"), Qt::LeftButton);
@@ -221,6 +219,17 @@ bool MouseClickEffect::isPressed(Qt::MouseButtons button, Qt::MouseButtons butto
 void MouseClickEffect::toggleEnabled()
 {
     m_enabled = !m_enabled;
+
+    if (m_enabled) {
+        connect(effects, SIGNAL(mouseChanged(QPoint,QPoint,Qt::MouseButtons,Qt::MouseButtons,Qt::KeyboardModifiers,Qt::KeyboardModifiers)),
+                         SLOT(slotMouseChanged(QPoint,QPoint,Qt::MouseButtons,Qt::MouseButtons,Qt::KeyboardModifiers,Qt::KeyboardModifiers)));
+        effects->startMousePolling();
+    } else {
+        disconnect(effects, SIGNAL(mouseChanged(QPoint,QPoint,Qt::MouseButtons,Qt::MouseButtons,Qt::KeyboardModifiers,Qt::KeyboardModifiers)),
+                   this, SLOT(slotMouseChanged(QPoint,QPoint,Qt::MouseButtons,Qt::MouseButtons,Qt::KeyboardModifiers,Qt::KeyboardModifiers)));
+        effects->stopMousePolling();
+    }
+
     if (m_clicks.size() > 0) {
         foreach (const MouseEvent* click, m_clicks) {
             delete click;
@@ -232,12 +241,6 @@ void MouseClickEffect::toggleEnabled()
         m_buttons[i]->m_time = 0;
         m_buttons[i]->m_isPressed = false;
     }
-
-    if (m_enabled) {
-        effects->startMousePolling();
-    } else {
-        effects->stopMousePolling();
-    }
 }
 
 bool MouseClickEffect::isActive() const

From 62b277ad9f543e955e82d81a6065327101bc4bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Thu, 30 Jan 2014 16:28:55 +0100
Subject: [PATCH 3/3] depend noborder on motif_noborder after reshape

app_noborder shall be the determined noborder (shape, type)
but relevant noborder shall be determined by rules and respect the
motif hint

BUG: 330573
FIXED-IN: 4.11.6
REVIEW: 115402
---
 client.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client.cpp b/client.cpp
index b576353ac7..fa52aceefb 100644
--- a/client.cpp
+++ b/client.cpp
@@ -718,7 +718,8 @@ void Client::updateShape()
     } else if (app_noborder) {
         xcb_shape_mask(connection(), XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING, frameId(), 0, 0, XCB_PIXMAP_NONE);
         detectNoBorder();
-        app_noborder = noborder = rules()->checkNoBorder(noborder);
+        app_noborder = noborder;
+        noborder = rules()->checkNoBorder(noborder || motif_noborder);
         updateDecoration(true);
     }