[Libreoffice-commits] .: 2 commits - ucb/source

[Caolán McNamara]

 ucb/source/ucp/gio/gio_content.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c7ddabe3f8e54bc588f6b200ba3997b504082563
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 20 17:25:17 2011 +0000

    Related: rhbz#668057 use default server-side permissions for copied files

diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 81fb4b0..612ea7f 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)
commit 09d3fa862c167ddfb4b039d7024e0732c00c001d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 20 16:45:25 2011 +0000

    Related: rhbz#668057 use default server-side permissions for copied files

diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 80125c2..81fb4b0 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)