[Libreoffice-commits] core.git: desktop/source

Stephan Bergmann sbergman at redhat.com
Mon Apr 4 19:44:26 UTC 2016


 desktop/source/app/officeipcthread.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 82a04a82699a87daa67c162896d6f7e2c1bbfe26
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 4 21:43:59 2016 +0200

    No DBUS_TIMEOUT_INFINITE before D-Bus 1.4.12
    
    Change-Id: Ie53359fb2b6a73fa3611e56314ae2df00457adc0

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index ea3566e..f46d903 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -533,8 +533,7 @@ RequestHandler::Status DbusIpcThread::enable(rtl::Reference<IpcThread> * thread)
                 }
                 DbusMessageHolder repl(
                     dbus_connection_send_with_reply_and_block(
-                        con.connection, msg.message, DBUS_TIMEOUT_INFINITE,
-                        &e));
+                        con.connection, msg.message, 0x7FFFFFFF, &e));
                 assert(
                     (repl.message == nullptr) == bool(dbus_error_is_set(&e)));
                 if (repl.message == nullptr) {


More information about the Libreoffice-commits mailing list