summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clipboardapplet/clipboard.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 4fbdf6f..3099a84 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -128,11 +128,11 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget(
128 connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); 128 connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( )));
129 connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( ))); 129 connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( )));
130 130
131 m_timer-> start ( 1500 );
132
133 m_menu = 0; 131 m_menu = 0;
134 m_dirty = true; 132 m_dirty = true;
135 m_lasttext = QString::null; 133 m_lasttext = QString::null;
134
135 m_timer-> start ( 0, true );
136} 136}
137 137
138ClipboardApplet::~ClipboardApplet ( ) 138ClipboardApplet::~ClipboardApplet ( )
@@ -228,6 +228,15 @@ void ClipboardApplet::paintEvent ( QPaintEvent* )
228 228
229void ClipboardApplet::newData ( ) 229void ClipboardApplet::newData ( )
230{ 230{
231 static bool excllock = false;
232
233 if ( excllock )
234 return;
235 else
236 excllock = true;
237
238 m_timer-> stop ( );
239
231 QCString type = "plain"; 240 QCString type = "plain";
232 QString txt = QApplication::clipboard ( )-> text ( type ); 241 QString txt = QApplication::clipboard ( )-> text ( type );
233 242
@@ -239,4 +248,8 @@ void ClipboardApplet::newData ( )
239 248
240 m_dirty = true; 249 m_dirty = true;
241 } 250 }
251
252 m_timer-> start ( 1500, true );
253
254 excllock = false;
242} 255}