| 1 |
From 51e0d789c344547956764c3b5f0ef5a304f4e0aa Mon Sep 17 00:00:00 2001 |
| 2 |
From: Stephan Bergmann <sbergman@redhat.com> |
| 3 |
Date: Mon, 13 Apr 2015 18:27:33 +0200 |
| 4 |
Subject: [PATCH] rhbz#1134285: Access dav, davs URLs via GVFS |
| 5 |
|
| 6 |
...so that LO shares the credentials with Nautilus once the connection has been |
| 7 |
set up in Nautilus. |
| 8 |
|
| 9 |
The reason the (non-standard) dav, davs URLs used by GNOME's old GnomeVFS and |
| 10 |
successor GVFS/GIO were handled via LO's webdav UCP rather than the GNOME- |
| 11 |
specific gnomevfs resp. gio UCP since b07a5fcc600ad564315d36fbd18495184fdf69cf |
| 12 |
"INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2" is discussed at |
| 13 |
<https://bz.apache.org/ooo/show_bug.cgi?id=84676> "mixing neon and the hidden |
| 14 |
embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is |
| 15 |
unreliable" and only pertains to the legacy gnomevfs UCP, not the new gio one. |
| 16 |
So keep handling dav, davs URLs via LO's internal webdav UCP under legacy |
| 17 |
--enable-gnome-vfs, but handle them via the GNOME-specific gio UCP under the |
| 18 |
default --enable-gio. |
| 19 |
|
| 20 |
Change-Id: Ib132168701a7ae0a7dcabdead6a299eda0cd4594 |
| 21 |
--- |
| 22 |
officecfg/Configuration_officecfg.mk | 1 + |
| 23 |
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 6 ++++-- |
| 24 |
postprocess/CustomTarget_registry.mk | 3 +++ |
| 25 |
3 files changed, 8 insertions(+), 2 deletions(-) |
| 26 |
|
| 27 |
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk |
| 28 |
index 7e2af03..af992b9 100644 |
| 29 |
--- a/officecfg/Configuration_officecfg.mk |
| 30 |
+++ b/officecfg/Configuration_officecfg.mk |
| 31 |
@@ -121,6 +121,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat |
| 32 |
org/openoffice/TypeDetection/UISort-math.xcu \ |
| 33 |
org/openoffice/ucb/Configuration-gio.xcu \ |
| 34 |
org/openoffice/ucb/Configuration-neon.xcu \ |
| 35 |
+ org/openoffice/ucb/Configuration-neon_gnomevfs.xcu \ |
| 36 |
org/openoffice/ucb/Configuration-win.xcu \ |
| 37 |
)) |
| 38 |
|
| 39 |
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu |
| 40 |
index e9704d3..9cb2a1a 100644 |
| 41 |
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu |
| 42 |
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu |
| 43 |
@@ -89,7 +89,8 @@ |
| 44 |
<value/> |
| 45 |
</prop> |
| 46 |
</node> |
| 47 |
- <node oor:name="Provider7" oor:op="replace" install:module="neon"> |
| 48 |
+ <node oor:name="Provider7" oor:op="replace" |
| 49 |
+ install:module="neon_gnomevfs"> |
| 50 |
<prop oor:name="ServiceName"> |
| 51 |
<value>com.sun.star.ucb.WebDAVContentProvider</value> |
| 52 |
</prop> |
| 53 |
@@ -155,7 +156,8 @@ |
| 54 |
<value/> |
| 55 |
</prop> |
| 56 |
</node> |
| 57 |
- <node oor:name="Provider13" oor:op="replace" install:module="neon"> |
| 58 |
+ <node oor:name="Provider13" oor:op="replace" |
| 59 |
+ install:module="neon_gnomevfs"> |
| 60 |
<prop oor:name="ServiceName"> |
| 61 |
<value>com.sun.star.ucb.WebDAVContentProvider</value> |
| 62 |
</prop> |
| 63 |
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk |
| 64 |
index a568832..e12640f 100644 |
| 65 |
--- a/postprocess/CustomTarget_registry.mk |
| 66 |
+++ b/postprocess/CustomTarget_registry.mk |
| 67 |
@@ -328,6 +328,9 @@ postprocess_DRIVERS += ado |
| 68 |
endif |
| 69 |
ifneq ($(WITH_WEBDAV),) |
| 70 |
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu |
| 71 |
+ifeq ($(ENABLE_GNOMEVFS),TRUE) |
| 72 |
+postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu |
| 73 |
+endif |
| 74 |
endif |
| 75 |
ifeq ($(ENABLE_EVOAB2),TRUE) |
| 76 |
postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu |
| 77 |
-- |
| 78 |
2.1.0 |
| 79 |
|
Parent Directory
| 
Revision Log