summaryrefslogtreecommitdiffstats
path: root/libkonq/konq_dirpart.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-05 16:01:32 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-05 16:02:26 -0500
commit699217f5ac7e8ccf5a023fb13b3a26d38c1d847b (patch)
tree1c05eb9489ae43f20c14f1075edc13759b19bd2a /libkonq/konq_dirpart.cc
parentcd928d143dc0f3c24bba655e3c26b615c5942812 (diff)
downloadtdebase-699217f5ac7e8ccf5a023fb13b3a26d38c1d847b.tar.gz
tdebase-699217f5ac7e8ccf5a023fb13b3a26d38c1d847b.zip
If drkonqi launches during logout show it after 30 seconds have elapsed
Diffstat (limited to 'libkonq/konq_dirpart.cc')
-rw-r--r--libkonq/konq_dirpart.cc9
1 files changed, 6 insertions, 3 deletions
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 );
}