diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-13 18:27:33 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-04-16 12:58:19 +0200 |
| commit | ef64455c9eb9404d67954555e4c70d77ebdf3059 (patch) | |
| tree | b17bcb5748cc723259985c45d4e00b93bb1a7b22 /postprocess | |
| parent | 83f4fb96d63998aed4797e4943bc830888d307c7 (diff) | |
rhbz#1134285: Access dav, davs URLs via GVFS
...so that LO shares the credentials with Nautilus once the connection has been
set up in Nautilus.
The reason the (non-standard) dav, davs URLs used by GNOME's old GnomeVFS and
successor GVFS/GIO were handled via LO's webdav UCP rather than the GNOME-
specific gnomevfs resp. gio UCP since b07a5fcc600ad564315d36fbd18495184fdf69cf
"INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2" is discussed at
<https://bz.apache.org/ooo/show_bug.cgi?id=84676> "mixing neon and the hidden
embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is
unreliable" and only pertains to the legacy gnomevfs UCP, not the new gio one.
So keep handling dav, davs URLs via LO's internal webdav UCP under legacy
--enable-gnome-vfs, but handle them via the GNOME-specific gio UCP under the
default --enable-gio.
Change-Id: Ib132168701a7ae0a7dcabdead6a299eda0cd4594
(cherry picked from commit 51e0d789c344547956764c3b5f0ef5a304f4e0aa)
Reviewed-on: https://gerrit.libreoffice.org/15296
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index ff106cb2e816..05f24067919e 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -333,6 +333,9 @@ postprocess_DRIVERS += ado endif ifneq ($(WITH_WEBDAV),) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu +ifeq ($(ENABLE_GNOMEVFS),TRUE) +postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu +endif endif ifeq ($(ENABLE_EVOAB2),TRUE) postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu |