SVN commit 1078193 by dfaure: Backport r1065134: Repair 'Send File' so that it only sends the selected files, like in kde3. Fixed for: 4.3.5 CCBUG: 218388 M +2 -9 konqmainwindow.cpp M +1 -0 konqview.cpp M +3 -0 konqview.h --- branches/KDE/4.3/kdebase/apps/konqueror/src/konqmainwindow.cpp #1078192:1078193 @@ -2713,15 +2713,8 @@ KUrl::List urls; if ( m_currentView ) { urls.append( m_currentView->url() ); -#if 0 - KonqDirPart* dirPart = ::qobject_cast(m_currentView->part()); - if ( dirPart ) { - const KFileItemList itemList = dirPart->selectedFileItems(); - if (!itemList.isEmpty()) { // Return list of selected items only if we have a selection - urls = itemList.urlList(); - } - } -#endif + if (!m_currentView->selectedItems().isEmpty()) // Return list of selected items only if we have a selection + urls = m_currentView->selectedItems().urlList(); } return urls; } --- branches/KDE/4.3/kdebase/apps/konqueror/src/konqview.cpp #1078192:1078193 @@ -625,6 +625,7 @@ void KonqView::slotSelectionInfo( const KFileItemList &items ) { + m_selectedItems = items; KonqFileSelectionEvent ev( items, m_pPart ); QApplication::sendEvent( m_pMainWindow, &ev ); } --- branches/KDE/4.3/kdebase/apps/konqueror/src/konqview.h #1078192:1078193 @@ -341,6 +341,8 @@ void enablePopupMenu( bool b ); bool isPopupMenuEnabled() const { return m_bPopupMenuEnabled; } + KFileItemList selectedItems() const { return m_selectedItems; } + void reparseConfiguration(); void disableScrolling(); @@ -471,6 +473,7 @@ QString m_sLocationBarURL; QString m_sTypedURL; KonqMainWindow::PageSecurity m_pageSecurity; + KFileItemList m_selectedItems; /** * The full history (back + current + forward)