diff options
author | Rodney Dawes <dobey@ximian.com> | 2003-12-02 23:55:48 +0800 |
---|---|---|
committer | Rodney Dawes <dobey@src.gnome.org> | 2003-12-02 23:55:48 +0800 |
commit | 8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5 (patch) | |
tree | 569fb274bda929af017be0674a19e635b6bdcb03 /mail | |
parent | f7900226cb5862961d363dfd19c7fcedd6496817 (diff) | |
download | gsoc2013-evolution-8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5.tar gsoc2013-evolution-8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5.tar.gz gsoc2013-evolution-8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5.tar.bz2 gsoc2013-evolution-8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5.tar.lz gsoc2013-evolution-8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5.tar.xz gsoc2013-evolution-8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5.tar.zst gsoc2013-evolution-8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5.zip |
Version the schemas Removed Added
2003-12-02 Rodney Dawes <dobey@ximian.com>
* gui/component/Makefile.am: Version the schemas
* gui/component/apps_evolution_addressbook.schemas: Removed
* gui/component/apps_evolution_addressbook.schemas.in.in: Added
2003-12-02 Rodney Dawes <dobey@ximian.com>
* gui/Makefile.am: Version the schemas
* gui/apps_evolution_calendar.schemas: Removed
* gui/apps_evolution_calendar.schemas.in.in: Added
2003-12-02 Rodney Dawes <dobey@ximian.com>
* Makefile.am: Version the schemas
* evolution-mail.schemas: Removed
* evolution-mail.schemas.in.in: Added
2003-12-02 Rodney Dawes <dobey@ximian.com>
* Makefile.am: Version the schemas
* apps_evolution_shell.schemas: Removed
* apps_evolution_shell.schemas.in.in: Added
svn path=/trunk/; revision=23579
Diffstat (limited to 'mail')
-rw-r--r-- | mail/ChangeLog | 6 | ||||
-rw-r--r-- | mail/Makefile.am | 7 | ||||
-rw-r--r-- | mail/evolution-mail.schemas.in.in (renamed from mail/evolution-mail.schemas) | 14 |
3 files changed, 12 insertions, 15 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index bf071d5f4d..bec65cd287 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2003-12-02 Rodney Dawes <dobey@ximian.com> + + * Makefile.am: Version the schemas + * evolution-mail.schemas: Removed + * evolution-mail.schemas.in.in: Added + 2003-12-02 Not Zed <NotZed@Ximian.com> * mail-config-druid.c (mail_config_druid_new): moved the diff --git a/mail/Makefile.am b/mail/Makefile.am index 748349dbbe..9907ce2c68 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -233,7 +233,12 @@ endif # GConf schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = evolution-mail.schemas +schema_in_files = evolution-mail.schemas.in.in +schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) +%-$(BASE_VERSION).schemas.in: %.schemas.in.in + cp $< $@ + +@INTLTOOL_SCHEMAS_RULE@ install-data-local: if test -z "$(DESTDIR)" ; then \ diff --git a/mail/evolution-mail.schemas b/mail/evolution-mail.schemas.in.in index 1a004050c1..013af3f96a 100644 --- a/mail/evolution-mail.schemas +++ b/mail/evolution-mail.schemas.in.in @@ -540,20 +540,6 @@ </schema> <schema> - <key>/schemas/apps/evolution/mail/prompts/empty_trash</key> - <applyto>/apps/evolution/mail/prompts/empty_trash</applyto> - <owner>evolution-mail</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Prompt when user empties the trash</short> - <long> - Do we prompt the user when he or she tries to empty the trash. - </long> - </locale> - </schema> - - <schema> <key>/schemas/apps/evolution/mail/prompts/only_bcc</key> <applyto>/apps/evolution/mail/prompts/only_bcc</applyto> <owner>evolution-mail</owner> |