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 | 5c4a11e83e978b8e790e471e644da7774c04251c (patch) | |
| tree | 262866667daa7e7817ac9a0c3d5f1427af0c438b /ucb/source/ucp/gio | |
| parent | 88fa511a7748ff920546bd28ac9e15f5e0ba2fb0 (diff) | |
Related: rhbz#668057 use default server-side permissions for copied files
Diffstat (limited to 'ucb/source/ucp/gio')
| -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 e0b6e97f5c3a..6383023bfafc 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) |