[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - pyuno/source sysui/desktop

[Tor Lillqvist]

 pyuno/source/loader/pyuno_loader.cxx |    6 ++++++
 sysui/desktop/icons/main.icns        |binary
 2 files changed, 6 insertions(+)

New commits:
commit 1140e24abe731f2f94bca072147aa570ea686583
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 21 20:46:03 2014 +0300

    Don't try to write Python bytecode files in case of a read-only installset
    
    It causes annoying messages in the system log in the OS X sandboxed
    case.
    
    Change-Id: I8ae3eb34df2c045bdbdfc63cae9007f973c42537

diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 375ea21..04ba4f7 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 #include <config_folders.h>
 
 #include <pyuno/pyuno.hxx>
@@ -219,6 +220,11 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
 #else
         PyImport_AppendInittab( (char*)"pyuno", initpyuno );
 #endif
+
+#if HAVE_FEATURE_READONLY_INSTALLSET
+        Py_DontWriteBytecodeFlag = 1;
+#endif
+
         // initialize python
         Py_Initialize();
         PyEval_InitThreads();
commit 6a750e189eda0b0e1a8e6e30c84739764b36692a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 21 20:32:54 2014 +0300

    Make the OS X icon round
    
    Should really play with GIMP or something to add some (subtle)
    embossing effects.
    
    Change-Id: I5bdb63c974bf20200b7d5e8c1f598d93aeca34db

diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index 9ef3f72..b2029bd 100644
Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ