diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-15 21:18:13 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-15 21:18:13 +0000 |
| commit | 70331186c82001a2652bf40e01d49dc8a8ac3a4b (patch) | |
| tree | 96693c5fe634e0d5cbc8739724aaab9cabd9a4bd /kio/kfile/kpropertiesdialog.cpp | |
| parent | 1c6affb83d6058a92f13e458abc3b5cec26c97ef (diff) | |
| download | tdelibs-70331186c82001a2652bf40e01d49dc8a8ac3a4b.tar.gz tdelibs-70331186c82001a2652bf40e01d49dc8a8ac3a4b.zip | |
Commit 1/2 of new (and optional!) builtin desktop icons
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1175771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio/kfile/kpropertiesdialog.cpp')
| -rw-r--r-- | kio/kfile/kpropertiesdialog.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 9e26f12bb..89529830a 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -638,7 +638,13 @@ bool KPropsDlgPlugin::isDesktopFile( KFileItem * _item ) fclose(f); // return true if desktop file - return ( _item->mimetype() == "application/x-desktop" ); + return ( (_item->mimetype() == "application/x-desktop") + || (_item->mimetype() == "media/builtin-mydocuments") + || (_item->mimetype() == "media/builtin-mycomputer") + || (_item->mimetype() == "media/builtin-mynetworkplaces") + || (_item->mimetype() == "media/builtin-printers") + || (_item->mimetype() == "media/builtin-trash") + || (_item->mimetype() == "media/builtin-webbrowser") ); } void KPropsDlgPlugin::setDirty( bool b ) @@ -1881,11 +1887,11 @@ static bool fileSystemSupportsACL( const TQCString& pathCString ) fileSystemSupportsACLs = ( statfs( pathCString.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS ); #else fileSystemSupportsACLs = - getxattr( pathCString.data(), "system.posix_acl_access", NULL, 0 ) >= 0 -#ifdef ENODATA + getxattr( pathCString.data(), "system.posix_acl_access", NULL, 0 ) >= 0 +#ifdef ENODATA || (errno == ENODATA) #endif -#ifdef ENOATTR +#ifdef ENOATTR || (errno == ENOATTR) #endif ; |