[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/pastebin
From:       Artur Duque de Souza <asouza () kde ! org>
Date:       2009-09-19 20:41:45
Message-ID: 1253392905.318863.1359.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1025839 by asouza:

Make the pastebin applet ignore updates of other applets
that are generated by the data engine.


 M  +8 -2      pastebin.cpp  
 M  +1 -0      pastebin.h  


--- trunk/KDE/kdeplasma-addons/applets/pastebin/pastebin.cpp #1025838:1025839
@@ -52,7 +52,7 @@
     : Plasma::Applet(parent, args),
       m_textBackend(0), m_imageBackend(0), m_imagePrivacy(0),
       m_historySize(3), m_signalMapper(new QSignalMapper()), m_paste(0),
-      m_topSeparator(0), m_bottomSeparator(0), m_servers(0)
+      m_topSeparator(0), m_bottomSeparator(0), m_servers(0), m_waiting(false)
 {
     setAcceptDrops(true);
     setHasConfigurationInterface(true);
@@ -114,13 +114,18 @@
 
 void Pastebin::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data &data)
 {
+    // if it's something not generated from this applet, ignore it
+    if (!m_waiting) {
+        return;
+    }
+
     // initialization of data
     if (data["result"].toString().isEmpty() && data["error"].toString().isEmpty()) {
         return;
     }
 
+    m_waiting = false;
     const QString msg(data[sourceName].toString());
-
     if (sourceName == "result") {
         const QString result(data["result"].toString());
         showResults(msg);
@@ -840,6 +845,7 @@
 
     setActionState(Sending);
     timer->start(20000);
+    m_waiting = true;
 }
 
 
--- trunk/KDE/kdeplasma-addons/applets/pastebin/pastebin.h #1025838:1025839
@@ -152,6 +152,7 @@
 
     // custom server dialog
     QWidget *m_servers;
+    bool m_waiting;
 
     QClipboard::Mode lastMode;
 
[prev in list] [next in list] [prev in thread] [next in thread]