1 files changed, 12 insertions, 3 deletions

diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 5848d0f..4fbdf6f 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -101,64 +101,73 @@ static const char * paste_xpm[] = {
 "    *{>;      ",
 " }}}@e:!;}}}  ",
 "<x8=&:#@+;ll, ",
 "}k/=;;3}337|o ",
 "<k's24444m45o ",
 "}8'ss4xkkk]}a ",
 "<1s224keee|b4 ",
 "}r2itmkeee]]44",
 "<9iitmkeeehkw.",
 "<lt-u4keeb)pn.",
 "<fu-umkebhp(0.",
 "<cugg4kbh)_(q.",
 "<cyyymk))p(%q.",
 ",5vvv4k)p_%[q.",
 " ...$mljnn0qd.",
 "     4.......,"};
 
 
 ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
 {
 	setFixedWidth ( 14 );
 	setFixedHeight ( 18 );
 	m_clipboardPixmap = QPixmap ( paste_xpm );
 
-	QTimer *timer = new QTimer ( this );
+	m_timer = new QTimer ( this );
 	
 	connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( )));
-	connect ( timer, SIGNAL( timeout ( )), this, SLOT( newData ( )));
+	connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( )));
+	connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( )));
 
-	timer-> start ( 1000 );
+	m_timer-> start ( 1500 );
 	
 	m_menu = 0;
 	m_dirty = true;
 	m_lasttext = QString::null;
 }
 
 ClipboardApplet::~ClipboardApplet ( )
 {
 }
 
+void ClipboardApplet::shutdown ( )
+{
+	// the timer has to be stopped, or Qt/E will hang on quit()
+	// see launcher/desktop.cpp
+
+	m_timer-> stop ( );
+}
+
 void ClipboardApplet::mousePressEvent ( QMouseEvent *)
 {
 	if ( m_dirty ) {
 		delete m_menu;
 	
 		m_menu = new QPopupMenu ( this );
 		m_menu-> setCheckable ( true );
 
 		if ( m_history. count ( )) {	
 			for ( unsigned int i = 0; i < m_history. count ( ); i++ ) {
 				QString str = m_history [i];
 				
 				if ( str. length ( ) > 20 )
 					str = str. left ( 20 ) + "...";
 			
 				m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i );
 				m_menu-> setItemChecked ( i, false );
 			}
 			m_menu-> setItemChecked ( m_history. count ( ) - 1, true );		
 			m_menu-> insertSeparator ( );
 		}
 		m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 );
 		m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 );
 		m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 );