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 | |
| parent | f7900226cb5862961d363dfd19c7fcedd6496817 (diff) | |
| download | gsoc2013-evolution-8dd5d1de36b4c40b645189ea16d2d84b09e0b1c5.tar.gz 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
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 7 | ||||
| -rw-r--r-- | addressbook/gui/component/apps_evolution_addressbook.schemas.in.in (renamed from addressbook/gui/component/apps_evolution_addressbook.schemas) | 0 | ||||
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 7 | ||||
| -rw-r--r-- | calendar/gui/apps_evolution_calendar.schemas.in.in (renamed from calendar/gui/apps_evolution_calendar.schemas) | 0 | ||||
| -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 | ||||
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/Makefile.am | 7 | ||||
| -rw-r--r-- | shell/apps_evolution_shell.schemas.in.in (renamed from shell/apps_evolution_shell.schemas) | 0 |
12 files changed, 48 insertions, 18 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index bec2937d7b..2e53c2db3c 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +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 Ettore Perazzoli <ettore@ximian.com> * gui/component/addressbook.c (set_status_message): Call diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 9583e53c8c..916ee1bfa7 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -64,7 +64,12 @@ libevolution_addressbook_la_LDFLAGS = -module -avoid-version # GConf schemas schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = apps_evolution_addressbook.schemas +schema_in_files = apps_evolution_addressbook.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/addressbook/gui/component/apps_evolution_addressbook.schemas b/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in index 82af9d0843..82af9d0843 100644 --- a/addressbook/gui/component/apps_evolution_addressbook.schemas +++ b/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ff1e256220..795d8e3301 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +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 Rodrigo Moya <rodrigo@ximian.com> * gui/dialogs/copy-source-dialog.c (copy_source_dialog): added diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index d900165b9c..bdb5f454fa 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -232,7 +232,12 @@ server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) # GConf schemas schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = apps_evolution_calendar.schemas +schema_in_files = apps_evolution_calendar.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@ EXTRA_DIST = \ e-calendar-marshal.list \ diff --git a/calendar/gui/apps_evolution_calendar.schemas b/calendar/gui/apps_evolution_calendar.schemas.in.in index 27e9aa44e2..27e9aa44e2 100644 --- a/calendar/gui/apps_evolution_calendar.schemas +++ b/calendar/gui/apps_evolution_calendar.schemas.in.in 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> diff --git a/shell/ChangeLog b/shell/ChangeLog index 0b4da8cd75..f6f0869fb9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +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 + 2003-12-01 Ettore Perazzoli <ettore@ximian.com> * e-activity-handler.c (e_activity_handler_operation_finished): diff --git a/shell/Makefile.am b/shell/Makefile.am index 8ac0866d88..c7935b6d5d 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -234,7 +234,12 @@ icons = \ # GConf schemas schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = apps_evolution_shell.schemas +schema_in_files = apps_evolution_shell.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/shell/apps_evolution_shell.schemas b/shell/apps_evolution_shell.schemas.in.in index e58974edd2..e58974edd2 100644 --- a/shell/apps_evolution_shell.schemas +++ b/shell/apps_evolution_shell.schemas.in.in |