From 51e0d789c344547956764c3b5f0ef5a304f4e0aa Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 13 Apr 2015 18:27:33 +0200 Subject: 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 "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 --- postprocess/CustomTarget_registry.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'postprocess') diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index a568832027b7..e12640f29825 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -328,6 +328,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 -- cgit