Kaydet (Commit) 51e0d789 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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 b07a5fcc
"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
üst 9f52efa4
...@@ -121,6 +121,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat ...@@ -121,6 +121,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/TypeDetection/UISort-math.xcu \ org/openoffice/TypeDetection/UISort-math.xcu \
org/openoffice/ucb/Configuration-gio.xcu \ org/openoffice/ucb/Configuration-gio.xcu \
org/openoffice/ucb/Configuration-neon.xcu \ org/openoffice/ucb/Configuration-neon.xcu \
org/openoffice/ucb/Configuration-neon_gnomevfs.xcu \
org/openoffice/ucb/Configuration-win.xcu \ org/openoffice/ucb/Configuration-win.xcu \
)) ))
......
...@@ -89,7 +89,8 @@ ...@@ -89,7 +89,8 @@
<value/> <value/>
</prop> </prop>
</node> </node>
<node oor:name="Provider7" oor:op="replace" install:module="neon"> <node oor:name="Provider7" oor:op="replace"
install:module="neon_gnomevfs">
<prop oor:name="ServiceName"> <prop oor:name="ServiceName">
<value>com.sun.star.ucb.WebDAVContentProvider</value> <value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop> </prop>
...@@ -155,7 +156,8 @@ ...@@ -155,7 +156,8 @@
<value/> <value/>
</prop> </prop>
</node> </node>
<node oor:name="Provider13" oor:op="replace" install:module="neon"> <node oor:name="Provider13" oor:op="replace"
install:module="neon_gnomevfs">
<prop oor:name="ServiceName"> <prop oor:name="ServiceName">
<value>com.sun.star.ucb.WebDAVContentProvider</value> <value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop> </prop>
......
...@@ -328,6 +328,9 @@ postprocess_DRIVERS += ado ...@@ -328,6 +328,9 @@ postprocess_DRIVERS += ado
endif endif
ifneq ($(WITH_WEBDAV),) ifneq ($(WITH_WEBDAV),)
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu 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 endif
ifeq ($(ENABLE_EVOAB2),TRUE) ifeq ($(ENABLE_EVOAB2),TRUE)
postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment