summaryrefslogtreecommitdiff
path: root/officecfg/registry/data
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-13 18:27:33 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-13 18:39:53 +0200
commit51e0d789c344547956764c3b5f0ef5a304f4e0aa (patch)
tree98760904c11a1814f020ce7ba3ba081d2fbaf64d /officecfg/registry/data
parent9f52efa43b2d65c0b6c92790cc2859e752bf975f (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
Diffstat (limited to 'officecfg/registry/data')
-rw-r--r--officecfg/registry/data/org/openoffice/ucb/Configuration.xcu6
1 files changed, 4 insertions, 2 deletions
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index e9704d3ac0d6..9cb2a1a85844 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -89,7 +89,8 @@
<value/>
</prop>
</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">
<value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop>
@@ -155,7 +156,8 @@
<value/>
</prop>
</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">
<value>com.sun.star.ucb.WebDAVContentProvider</value>
</prop>