kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'KDE/4.14' of git://anongit.kde.org/kde-baseapps into KDE/4.14

Browse source
This commit is contained in:
Emmanuel Pescosta 2014-10-29 12:19:04 +01:00
parent 9d73311a10 9e477d9c76
commit ebad54a5d6
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
konqueror/about/konq_aboutpage.desktop
View file

@ -26,7 +26,7 @@ Name[es]=Página «Acerca de» para Konqueror
Name[et]=Konquerori info
Name[eu]=Konqueror-en 'Honi buruz' orrialdea
Name[fa]=صفحه درباره برای Konqueror
Name[fi]=Konquerorin tietoja-sivu
Name[fi]=Konquerorin tietoa-sivu
Name[fr]=Page « À propos » de Konqueror
Name[fy]=Ynformaasjeside foar Konqueror
Name[ga]=Leathanach Eolais le haghaidh Konqueror

14
lib/konq/konq_operations.cpp
View file

@ -470,8 +470,18 @@ void KonqOperations::doDropFileCopy()
for (KUrl::List::ConstIterator it = lst.begin(); it != lst.end(); ++it)
{
bool local = (*it).isLocalFile();
if ( KProtocolManager::supportsDeleting( *it ) && (!local || QFileInfo((*it).directory()).isWritable() ))
mlst.append(*it);
if ( KProtocolManager::supportsDeleting( *it ) ) {
if (!local) {
mlst.append(*it);
} else {
QFileInfo itemInfo((*it).toLocalFile());
QFileInfo dirInfo(itemInfo.absolutePath());
// Posix does not permit the movement of a read-only folder, regardless of the permissions of its parent
if (dirInfo.isWritable() && (!itemInfo.isDir() || itemInfo.isWritable())) {
mlst.append(*it);
}
}
}
if ( local && KDesktopFile::isDesktopFile((*it).toLocalFile()))
isDesktopFile = true;
if ( local && (*it).path().startsWith(KGlobalSettings::desktopPath()))