summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--konqueror/iconview/konq_iconview.cc6
-rw-r--r--starttde2
2 files changed, 1 insertions, 7 deletions
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 7ff2db6e9..04b2bfb51 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -1051,14 +1051,9 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
void KonqKfmIconView::slotDeleteItem( KFileItem * _fileitem )
{
- // new in 3.5.5
-#ifdef TDEPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
KFileItemList list;
list.append( _fileitem );
emit m_extension->itemsRemoved( list );
-#else
-#error "Your tdelibs doesn't have KParts::BrowserExtension::itemsRemoved, please update it to at least 3.5.5"
-#endif
if ( _fileitem == m_dirLister->rootItem() )
{
@@ -1079,7 +1074,6 @@ void KonqKfmIconView::slotDeleteItem( KFileItem * _fileitem )
m_pIconView->stopImagePreview();
KonqDirPart::deleteItem( _fileitem );
- m_pIconView->takeItem( ivi );
m_mimeTypeResolver->m_lstPendingMimeIconItems.remove( ivi );
m_itemDict.remove( _fileitem );
if (m_paOutstandingOverlays.first() == ivi) // Being processed?
diff --git a/starttde b/starttde
index 269d4ffa5..5e4a0db00 100644
--- a/starttde
+++ b/starttde
@@ -81,7 +81,7 @@ unset BIN_DIR
# When the X server dies we get a HUP signal from xinit. We must ignore it
# because we still need to do some cleanup.
-trap '[starttde] echo GOT SIGHUP' HUP
+trap 'echo "[starttde] GOT SIGHUP"' HUP
# Check if a TDE session is already running.
if kcheckrunning >/dev/null 2>&1; then