summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-12-01 12:49:39 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-01 12:49:39 +0000
commitfdd1df3de3e902df73e389d045054d86807df84a (patch)
tree5abe18505ed84d4d1beb309169e837a987881382
parent29c460d124dba19c95f3deda42a5810e7509073b (diff)
fdo#32007# Only register EvolutionLocal when evolution support is enabled
-rw-r--r--officecfg/registry/data/org/openoffice/Office/DataAccess.xcu2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/makefile.mk3
2 files changed, 3 insertions, 2 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index 4e70af0090..fdf497ca74 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -153,7 +153,7 @@
</node>
</node>
<node oor:name="RegisteredNames">
- <node oor:name="EvolutionLocal" oor:op="replace">
+ <node oor:name="EvolutionLocal" oor:op="replace" install:module="evoab2">
<prop oor:name="Location" oor:type="xs:string">
<value>$(userurl)/database/evolocal.odb</value>
</prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 2af1e8629b..31e228d567 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -99,7 +99,8 @@ MODULEFILES= \
Embedding-base.xcu \
Embedding-writer.xcu \
UI-brand.xcu \
- Recovery-gconflockdown.xcu
+ Recovery-gconflockdown.xcu \
+ DataAccess-evoab2.xcu
LOCALIZEDFILES= \
Accelerators.xcu \