[Libreoffice-commits] core.git: 3 commits - configure.ac desktop/source lo.xcent.in

[Tor Lillqvist]

 configure.ac                           |    5 +++--
 desktop/source/app/app.cxx             |   22 +++++++++++++++++++++-
 desktop/source/app/officeipcthread.cxx |    2 +-
 desktop/source/app/officeipcthread.hxx |    1 +
 lo.xcent.in                            |    2 ++
 5 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit 6a0017e05c6c8655991732944b7799920bd07222
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 5 00:06:03 2013 +0200

    Use the "Developer ID Application" identity for codesigning by default
    
    Change-Id: I460f18f257323745a068b1685b295b0379615e1b

diff --git a/configure.ac b/configure.ac
index fd8f10b..51b9244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2725,9 +2725,10 @@ if test "$_os" = "Darwin"; then
         # http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application
         # says that the "Mac Developer" certificate is useful just for self-testing. For distribution
         # outside the Mac App Store, use the "Developer ID Application" one, and for distribution in
-        # the App Store, the "3rd Party Mac Developer" one.
+        # the App Store, the "3rd Party Mac Developer" one. I think it works best to the the
+        # "Developer ID Application" one.
 
-        identity=`security find-identity -p codesigning -v 2>/dev/null | grep 'Mac Developer:' | awk '{print $2}' |head -1`
+        identity=`security find-identity -p codesigning -v 2>/dev/null | grep 'Developer ID Application:' | awk '{print $2}' |head -1`
         if test -n "$identity"; then
             MACOSX_CODESIGNING_IDENTITY=$identity
             pretty_name=`security find-identity -p codesigning -v | grep $MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^"]]*"//' -e 's/"//'`
commit 2ef814e012f9cc07ecfbf88c85ebe6f2d38f2887
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Feb 4 23:56:20 2013 +0200

    We want to be able to print
    
    Change-Id: Ib6b984ac7697e91056ca97e95ce0628b965d6186

diff --git a/lo.xcent.in b/lo.xcent.in
index 5ed76f1..5e28867 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -11,5 +11,7 @@
 	<!-- usb needed for the apple_remote thingie... -->
 	<key>com.apple.security.device.usb</key>
 	<true/>
+	<key>com.apple.security.print</key>
+	<true/>
 </dict>
 </plist>
commit 701d19fb4fd4fbafb8317b4305614715aeb9e4f9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Feb 4 23:46:16 2013 +0200

    Ignore IPC socket setup errors on OS X as they occur always when sandboxed
    
    In a sandboxed LibreOffice, on 10.8.2 at least, creating the Unix
    domain socket fails. Ignore that as hopefully people running a
    sandboxed LO won't attempt starting it from the command-line or in
    other tricky ways, so the normal OS X mechanism that prevents multiple
    instances of an app from being started should work fine. I hope.
    
    Change-Id: I4e0aa0c823328d00c8ff1c039859e78ba8ae92c5

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c541566..0f239d1 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -596,7 +596,27 @@ void Desktop::Init()
         // start ipc thread only for non-remote offices
         RTL_LOGFILE_CONTEXT( aLog2, "desktop (cd100003) ::OfficeIPCThread::EnableOfficeIPCThread" );
         OfficeIPCThread::Status aStatus = OfficeIPCThread::EnableOfficeIPCThread();
-        if ( aStatus == OfficeIPCThread::IPC_STATUS_BOOTSTRAP_ERROR )
+        if ( aStatus == OfficeIPCThread::IPC_STATUS_PIPE_ERROR )
+        {
+#ifdef MACOSX
+            // In a sandboxed LO, on 10.8.2 at least, creating the
+            // Unix domain socket fails. Ignore that as hopefully
+            // people running a sandboxed LO won't attempt starting it
+            // from the command-line or otherwise in tricky ways, so
+            // the normal OS X mechanism that prevents multiple
+            // instances of an app from being started should work
+            // fine. I hope.
+#else
+            // Keep using this oddly named BE_PATHINFO_MISSING value
+            // for pipe-related errors on other platforms. Of course
+            // this crack with two (if not more) levels of our own
+            // error codes hiding the actual system error code is
+            // broken, but that is done all over the code, let's leave
+            // re-enginering that to another year.
+            SetBootstrapError( BE_PATHINFO_MISSING, OUString() );
+#endif
+        }
+        else if ( aStatus == OfficeIPCThread::IPC_STATUS_BOOTSTRAP_ERROR )
         {
             SetBootstrapError( BE_PATHINFO_MISSING, OUString() );
         }
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index cc9dd37..129e884 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -525,7 +525,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
         {
             oslPipeError eReason = pThread->maPipe.getError();
             if ((eReason == osl_Pipe_E_ConnectionRefused) || (eReason == osl_Pipe_E_invalidError))
-                return IPC_STATUS_BOOTSTRAP_ERROR;
+                return IPC_STATUS_PIPE_ERROR;
 
             // Wait for second office to be ready
             TimeValue aTimeValue;
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 440fd24..f60084d 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -107,6 +107,7 @@ class OfficeIPCThread : public salhelper::Thread
     {
         IPC_STATUS_OK,
         IPC_STATUS_2ND_OFFICE,
+        IPC_STATUS_PIPE_ERROR,
         IPC_STATUS_BOOTSTRAP_ERROR
     };