From 699217f5ac7e8ccf5a023fb13b3a26d38c1d847b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 5 Oct 2014 16:01:32 -0500 Subject: If drkonqi launches during logout show it after 30 seconds have elapsed --- libkonq/konq_dirpart.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libkonq') diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index ea1b19bb0..0cd801896 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -419,9 +419,11 @@ void KonqDirPart::slotClipboardDataChanged() KURL::List lst; TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "application/x-tde-cutselection" ) && data->provides( "text/uri-list" ) ) - if ( KonqDrag::decodeIsCutSelection( data ) ) + if ( data->provides( "application/x-tde-cutselection" ) && data->provides( "text/uri-list" ) ) { + if ( KonqDrag::decodeIsCutSelection( data ) ) { (void) KURLDrag::decode( data, lst ); + } + } disableIcons( lst ); @@ -432,8 +434,9 @@ void KonqDirPart::updatePasteAction() // KDE4: merge into method above { TQString actionText = TDEIO::pasteActionText(); bool paste = !actionText.isEmpty(); - if ( paste ) + if ( paste ) { emit m_extension->setActionText( "paste", actionText ); + } emit m_extension->enableAction( "paste", paste ); } -- cgit v1.2.1