diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-01-20 17:25:17 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-20 17:25:17 +0000 |
commit | c7ddabe3f8e54bc588f6b200ba3997b504082563 (patch) | |
tree | 67d8fff56853156b22dd407238f99f603691b1c5 /ucb | |
parent | 09d3fa862c167ddfb4b039d7024e0732c00c001d (diff) |
Related: rhbz#668057 use default server-side permissions for copied files
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/gio/gio_content.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 81fb4b0360..612ea7fff4 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -1068,7 +1068,7 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream, } } -const GFileCopyFlags DEFAULT_TRANSFER_FLAGS = +const GFileCopyFlags DEFAULT_COPYDATA_FLAGS = static_cast<GFileCopyFlags>(G_FILE_COPY_OVERWRITE|G_FILE_COPY_TARGET_DEFAULT_PERMS); void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) @@ -1086,9 +1086,9 @@ void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Refer gboolean bSuccess = false; GError *pError = NULL; if (aTransferInfo.MoveData) - bSuccess = g_file_move(pSource, pDest, DEFAULT_TRANSFER_FLAGS, NULL, NULL, 0, &pError); + bSuccess = g_file_move(pSource, pDest, G_FILE_COPY_OVERWRITE, NULL, NULL, 0, &pError); else - bSuccess = g_file_copy(pSource, pDest, DEFAULT_TRANSFER_FLAGS, NULL, NULL, 0, &pError); + bSuccess = g_file_copy(pSource, pDest, DEFAULT_COPYDATA_FLAGS, NULL, NULL, 0, &pError); g_object_unref(pSource); g_object_unref(pDest); if (!bSuccess) |