[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-1' - 2 commits - debian/control loleaflet/src

[Andras Timar]

 debian/control               |    2 +-
 loleaflet/src/core/Socket.js |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e25f420eba514d33b342ea6b34c39f1ea916e421
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Mar 20 13:49:56 2018 +0100

    deb dependencies (esp. libpoppler58)
    
    Change-Id: Ib7160192c65808f557a9a9c8d62248be48ca7641

diff --git a/debian/control b/debian/control
index a40c20bd0..51c2ea1bb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.41), collaboraofficebasis5.3-core (>= 5.3.10.41), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.41), collaboraofficebasis5.3-images (>= 5.3.10.41), collaboraofficebasis5.3-impress (>= 5.3.10.41), collaboraofficebasis5.3-ooofonts (>= 5.3.10.41), collaboraofficebasis5.3-writer (>= 5.3.10.41), collaboraoffice5.3 (>= 5.3.10.41), collaboraoffice5.3-ure (>= 5.3.10.41), collaboraofficebasis5.3-en-us (>= 5.3.10.41), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.41), collaboraofficebasis5.3-en-us-res (>= 5.3.10.41), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.41), collaboraofficebasis5.3-draw (>= 5.3.10.41), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.41), collaboraofficebasis5.3-filter-data (>= 5.3.10.41)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libcurl3-gnutls, cpio, libcap2-bin, libexpat1, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, libxcb-render0, libxcb-shm0, libxml2, collaboraofficebasis5.3-calc (>= 5.3.10.43), collaboraofficebasis5.3-core (>= 5.3.10.43), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.43), collaboraofficebasis5.3-images (>= 5.3.10.43), collaboraofficebasis5.3-impress (>= 5.3.10.43), collaboraofficebasis5.3-ooofonts (>= 5.3.10.43), collaboraofficebasis5.3-writer (>= 5.3.10.43), collaboraoffice5.3 (>= 5.3.10.43), collaboraoffice5.3-ure (>= 5.3.10.43), collaboraofficebasis5.3-en-us (>= 5.3.10.43), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.43), collaboraofficebasis5.3-en-us-res (>= 5.3.10.43), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.43), collaboraofficebasis5.3-draw (>= 5.3.10.43), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.43), collaboraofficebasis
 5.3-filter-data (>= 5.3.10.43)
 Conflicts: collaboraofficebasis5.3-gnome-integration, collaboraofficebasis5.3-kde-integration
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
commit 0f6f3176782d60ce485ea042011f9365ad4ea1e3
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Mar 19 20:58:40 2018 -0400

    leaflet: don't show 'failed to load doc' error
    
    Change-Id: I5219a1f78f22dceb193d8a1856b3bd208e5ebbcf

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 4b609f288..a466cf21e 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -419,6 +419,7 @@ L.Socket = L.Class.extend({
 				// better we do it first so that another error message doesn't override this one
 				// upon socket close.
 				this.close();
+				return; // Don't show this message.
 			}
 			else if (command.errorKind === 'documentconflict')
 			{