aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/Makefile.am2
-rw-r--r--shell/apps_evolution_shell.schemas.in.in2
3 files changed, 10 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 3e4400f822..7436d4e7e1 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-08 Frederic Crozat <fcrozat@mandrakesoft.com>
+
+ * Makefile.am:
+ tarball should ship .schemas.in.in files, not generated files.
+
+ * apps_evolution_shell.schemas.in.in:
+ Don't translate default component id (bug #60859)
+
2004-07-06 Rodney Dawes <dobey@novell.com>
* e-shell-errors.xml.h: Add this back to CVS for translators
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 527b2d92f1..4583f3cb92 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -233,7 +233,7 @@ EXTRA_DIST = \
$(error_DATA) \
$(error_i18n) \
$(glade_DATA) \
- $(schema_DATA) \
+ $(schema_in_files) \
ChangeLog.pre-1-4 \
e-shell-marshal.list \
evolution-nognome.in
diff --git a/shell/apps_evolution_shell.schemas.in.in b/shell/apps_evolution_shell.schemas.in.in
index e26cb28717..00080ffde1 100644
--- a/shell/apps_evolution_shell.schemas.in.in
+++ b/shell/apps_evolution_shell.schemas.in.in
@@ -100,8 +100,8 @@
<applyto>/apps/evolution/shell/view_defaults/component_id</applyto>
<owner>evolution</owner>
<type>string</type>
+ <default>mail</default>
<locale name="C">
- <default>mail</default>
<short>ID or alias of the component to be shown by default at start-up.</short>
</locale>
</schema>