diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/apps_evolution_calendar.schemas.in.in | 4 | ||||
| -rw-r--r-- | calendar/gui/migration.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f06a8ca2c1..dc73ff96bb 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2006-06-12 Wang Xin <jedy.wang@sun.com> + + **Fixes bug #344630 + Change key confirm_expunge to confirm_purge. + * gui/apps_evolution_calendar.schemas.in.in: + * gui/migration.c: + 2006-06-12 Srinivasa Ragavan <sragavan@novell.com> * gui/alarm-notify/alarm-queue.c: (remove_queued_alarm), diff --git a/calendar/gui/apps_evolution_calendar.schemas.in.in b/calendar/gui/apps_evolution_calendar.schemas.in.in index 1952ddc472..0286abbf26 100644 --- a/calendar/gui/apps_evolution_calendar.schemas.in.in +++ b/calendar/gui/apps_evolution_calendar.schemas.in.in @@ -420,8 +420,8 @@ </schema> <schema> - <key>/schemas/apps/evolution/calendar/prompts/confirm_expunge</key> - <applyto>/apps/evolution/calendar/prompts/confirm_expunge</applyto> + <key>/schemas/apps/evolution/calendar/prompts/confirm_purge</key> + <applyto>/apps/evolution/calendar/prompts/confirm_purge</applyto> <owner>evolution-calendar</owner> <type>bool</type> <default>true</default> diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index cdb19dc8a8..1cc2a0c169 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -101,7 +101,7 @@ static e_gconf_map_t calendar_tasks_colours_map[] = { static e_gconf_map_t calendar_other_map[] = { /* /Calendar/Other */ { "ConfirmDelete", "calendar/prompts/confirm_delete", E_GCONF_MAP_BOOL }, - { "ConfirmExpunge", "calendar/prompts/confirm_expunge", E_GCONF_MAP_BOOL }, + { "ConfirmExpunge", "calendar/prompts/confirm_purge", E_GCONF_MAP_BOOL }, { "UseDefaultReminder", "calendar/other/use_default_reminder", E_GCONF_MAP_BOOL }, { "DefaultReminderInterval", "calendar/other/default_reminder_interval", E_GCONF_MAP_INT }, { "DefaultReminderUnits", "calendar/other/default_reminder_units", E_GCONF_MAP_STRING }, |