summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt9
-rw-r--r--config.h.cmake4
-rw-r--r--tdeio/CMakeLists.txt6
-rw-r--r--tdeio/tdefile/kpropertiesdialog.cpp54
4 files changed, 61 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0eabf0270..d6d9f2441 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,6 +174,7 @@ check_include_file( "stdlib.h" HAVE_STDLIB_H )
check_include_file( "strings.h" HAVE_STRINGS_H )
check_include_file( "string.h" HAVE_STRING_H )
check_include_file( "sysent.h" HAVE_SYSENT_H )
+check_include_file( "sys/acl.h" HAVE_SYS_ACL_H )
check_include_file( "sys/bitypes.h" HAVE_SYS_BITYPES_H )
check_include_file( "sys/dir.h" HAVE_SYS_DIR_H )
check_include_file( "sys/filio.h" HAVE_SYS_FILIO_H )
@@ -190,7 +191,7 @@ check_include_file( "sys/stat.h" HAVE_SYS_STAT_H )
check_include_file( "sys/stropts.h" HAVE_SYS_STROPTS_H )
check_include_file( "sys/types.h" HAVE_SYS_TYPES_H )
check_include_file( "sys/ucred.h" HAVE_SYS_UCRED_H )
-check_include_file( "sys/xattr.h" sys/xattr.h )
+check_include_file( "sys/xattr.h" HAVE_SYS_XATTR_H )
check_include_file( "termios.h" HAVE_TERMIOS_H )
check_include_file( "termio.h" HAVE_TERMIO_H )
check_include_file( "unistd.h" HAVE_UNISTD_H )
@@ -204,6 +205,12 @@ if( HAVE_SYS_TIME_H AND HAVE_TIME_H )
set( TIME_WITH_SYS_TIME 1 )
endif( HAVE_SYS_TIME_H AND HAVE_TIME_H )
+if( HAVE_SYS_ACL_H )
+ set( USE_POSIX_ACL 1 )
+endif( HAVE_SYS_ACL_H )
+
+check_include_file( "acl/libacl.h" HAVE_NON_POSIX_ACL_EXTENSIONS )
+
check_include_file( "valgrind/memcheck.h" HAVE_VALGRIND_MEMCHECK_H )
check_include_file( "values.h" HAVE_VALUES_H )
check_include_file( "X11/extensions/shape.h" HAVE_X11_EXTENSIONS_SHAPE_H )
diff --git a/config.h.cmake b/config.h.cmake
index 265b5afb9..b4e04b43a 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -360,7 +360,7 @@
#undef HAVE_NL_TYPES_H
/* Define if system has non-POSIX extensions to the ACL support. */
-#undef HAVE_NON_POSIX_ACL_EXTENSIONS
+#cmakedefine HAVE_NON_POSIX_ACL_EXTENSIONS 1
/* Define if your system needs _NSGetEnviron to set up the environment */
#undef HAVE_NSGETENVIRON
@@ -823,7 +823,7 @@
#cmakedefine TIME_WITH_SYS_TIME 1
/* Define if system has POSIX ACL support. */
-#undef USE_POSIX_ACL
+#cmakedefine USE_POSIX_ACL 1
/* Version number of package */
#define VERSION "@VERSION@"
diff --git a/tdeio/CMakeLists.txt b/tdeio/CMakeLists.txt
index 826fbf743..bdb545c95 100644
--- a/tdeio/CMakeLists.txt
+++ b/tdeio/CMakeLists.txt
@@ -55,6 +55,10 @@ if( HAVE_ELFICON )
set( ELFICON_STATIC_LIB tdelficon-static )
endif( HAVE_ELFICON )
+if( HAVE_NON_POSIX_ACL_EXTENSIONS )
+ set( ACL_LIBRARIES acl )
+endif( HAVE_NON_POSIX_ACL_EXTENSIONS )
+
##### libtdeio ####################################
@@ -66,6 +70,6 @@ tde_add_library( ${target} SHARED
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
VERSION 4.2.0
EMBED kssl-static tdeiocore-static tdesycoca-static kbookmarks-static tdefile-static ${ELFICON_STATIC_LIB}
- LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES}
+ LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES} ${ACL_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index bece689ca..f865e2f2d 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -729,8 +729,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
TQString magicMimeComment;
if ( isLocal ) {
KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() );
- if ( magicMimeType->name() != KMimeType::defaultMimeType() )
+ if ( magicMimeType->name() != KMimeType::defaultMimeType() ) {
magicMimeComment = magicMimeType->comment();
+ }
}
// Those things only apply to 'single file' mode
@@ -1312,8 +1313,9 @@ void tqt_leave_modal( TQWidget *widget );
void KFilePropsPlugin::applyChanges()
{
- if ( d->dirSizeJob )
+ if ( d->dirSizeJob ) {
slotSizeStop();
+ }
kdDebug(250) << "KFilePropsPlugin::applyChanges" << endl;
@@ -1345,17 +1347,20 @@ void KFilePropsPlugin::applyChanges()
properties->rename( newFileName );
// Update also relative path (for apps and mimetypes)
- if ( !m_sRelativePath.isEmpty() )
+ if ( !m_sRelativePath.isEmpty() ) {
determineRelativePath( properties->kurl().path() );
+ }
kdDebug(250) << "New URL = " << properties->kurl().url() << endl;
kdDebug(250) << "old = " << oldurl.url() << endl;
// Don't remove the template !!
- if ( !m_bFromTemplate ) // (normal renaming)
+ if ( !m_bFromTemplate ) { // (normal renaming)
job = TDEIO::move( oldurl, properties->kurl() );
- else // Copying a template
+ }
+ else { // Copying a template
job = TDEIO::copy( oldurl, properties->kurl() );
+ }
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
@@ -1370,8 +1375,9 @@ void KFilePropsPlugin::applyChanges()
}
properties->updateUrl(properties->kurl());
// Update also relative path (for apps and mimetypes)
- if ( !m_sRelativePath.isEmpty() )
+ if ( !m_sRelativePath.isEmpty() ) {
determineRelativePath( properties->kurl().path() );
+ }
}
// No job, keep going
@@ -2584,16 +2590,30 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props )
TQString path = properties->kurl().path();
TQFile f( path );
- if ( !f.open( IO_ReadOnly ) )
+ if ( !f.open( IO_ReadOnly ) ) {
return;
+ }
f.close();
KSimpleConfig config( path );
config.setDesktopGroup();
URLStr = config.readPathEntry( "URL" );
- if ( !URLStr.isNull() )
+ KFileItem * item = properties->item();
+
+ if (item && item->mimetype() == "media/builtin-mydocuments") {
+ URLStr = TQString::null;
+ TDEConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
+ URLEdit->setMode(KFile::Directory);
+ URLEdit->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", TQDir::homeDirPath() + "/Documents").remove( "\"" ));
+ }
+ else if (item && item->mimetype().startsWith("media/builtin-")) {
+ URLEdit->setEnabled(false);
+ }
+
+ if ( !URLStr.isNull() ) {
URLEdit->setURL( URLStr );
+ }
connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
this, TQT_SIGNAL( changed() ) );
@@ -2628,6 +2648,24 @@ bool KURLPropsPlugin::supports( KFileItemList _items )
void KURLPropsPlugin::applyChanges()
{
TQString path = properties->kurl().path();
+ KFileItem * item = properties->item();
+
+ if (item && item->mimetype() == "media/builtin-mydocuments") {
+ TDEConfig xdgconfig(TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
+ if (xdgconfig.isReadOnly()) {
+ KMessageBox::sorry( 0, i18n("<qt>Could not save properties. You do not have "
+ "sufficient access to write to <b>%1</b>.</qt>").arg(path));
+ return;
+ }
+ else {
+ xdgconfig.writePathEntry( "XDG_DOCUMENTS_DIR", '"'+ URLEdit->url() + '"', true, false, false, false );
+ xdgconfig.sync();
+ return;
+ }
+ }
+ else if (item && item->mimetype().startsWith("media/builtin-")) {
+ return;
+ }
TQFile f( path );
if ( !f.open( IO_ReadWrite ) ) {
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 14:10:59 +0000