diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-20 16:45:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-20 16:45:25 +0000 |
| commit | 09d3fa862c167ddfb4b039d7024e0732c00c001d (patch) | |
| tree | d62e05d2616374ac574604ba3df45df5eef25d28 /ucb | |
| parent | 898c3aa0f57dfdad973b1c9fe3a3e81bb63cbadc (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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 80125c27df..81fb4b0360 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -1068,6 +1068,9 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream, } } +const GFileCopyFlags DEFAULT_TRANSFER_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 ) throw( uno::Exception ) { @@ -1083,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, G_FILE_COPY_OVERWRITE, NULL, NULL, 0, &pError); + bSuccess = g_file_move(pSource, pDest, DEFAULT_TRANSFER_FLAGS, NULL, NULL, 0, &pError); else - bSuccess = g_file_copy(pSource, pDest, G_FILE_COPY_OVERWRITE, NULL, NULL, 0, &pError); + bSuccess = g_file_copy(pSource, pDest, DEFAULT_TRANSFER_FLAGS, NULL, NULL, 0, &pError); g_object_unref(pSource); g_object_unref(pDest); if (!bSuccess) |