[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=0eeb583

The following commit has been merged in the master branch:
commit 0eeb58356c33af9419d68dc95ffcd9846caebcbb
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Apr 19 12:32:26 2015 -0700

    Fixed clipboard re-setting infinitely when devices form a connection loop.
    
    Not tested.
    
    BUG: 346173
---
 plugins/clipboard/clipboardplugin.cpp | 17 ++++++++++-------
 plugins/clipboard/clipboardplugin.h   |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/clipboard/clipboardplugin.cpp b/plugins/clipboard/clipboardplugin.cpp
index a37f724..656dc72 100644
--- a/plugins/clipboard/clipboardplugin.cpp
+++ b/plugins/clipboard/clipboardplugin.cpp
@@ -31,7 +31,6 @@ Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_CLIPBOARD, "kdeconnect.plugin.clipboard")
 
 ClipboardPlugin::ClipboardPlugin(QObject *parent, const QVariantList &args)
     : KdeConnectPlugin(parent, args)
-    , ignore_next_clipboard_change(false)
     , clipboard(QGuiApplication::clipboard())
 {
     connect(clipboard, SIGNAL(changed(QClipboard::Mode)), this, SLOT(clipboardChanged(QClipboard::Mode)));
@@ -39,21 +38,25 @@ ClipboardPlugin::ClipboardPlugin(QObject *parent, const QVariantList &args)
 
 void ClipboardPlugin::clipboardChanged(QClipboard::Mode mode)
 {
-    if (mode != QClipboard::Clipboard) return;
+    if (mode != QClipboard::Clipboard) {
+        return;
+    }
+
+    QString content = clipboard->text();
 
-    if (ignore_next_clipboard_change) {
-        ignore_next_clipboard_change = false;
+    if (content == currentContent) {
         return;
     }
-//     qCDebug(KDECONNECT_PLUGIN_CLIPBOARD) << "ClipboardChanged";
+
+    currentContent = content;
+
     NetworkPackage np(PACKAGE_TYPE_CLIPBOARD);
-    np.set("content",clipboard->text());
+    np.set("content", content);
     sendPackage(np);
 }
 
 bool ClipboardPlugin::receivePackage(const NetworkPackage& np)
 {
-    ignore_next_clipboard_change = true;
     clipboard->setText(np.get<QString>("content"));
     return true;
 }
diff --git a/plugins/clipboard/clipboardplugin.h b/plugins/clipboard/clipboardplugin.h
index f2198f4..12d34c2 100644
--- a/plugins/clipboard/clipboardplugin.h
+++ b/plugins/clipboard/clipboardplugin.h
@@ -45,7 +45,7 @@ private Q_SLOTS:
     void clipboardChanged(QClipboard::Mode mode);
 
 private:
-    bool ignore_next_clipboard_change;
+    QString currentContent;
     QClipboard *clipboard;
 };
 

-- 
kdeconnect packaging