diff options
| -rw-r--r-- | calendar/ChangeLog | 14 | ||||
| -rw-r--r-- | calendar/gui/migration.c | 25 |
2 files changed, 37 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 538a957420..6fb8396b5a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2004-02-24 JP Rosevear <jpr@ximian.com> + + * gui/migration.c (migrate_calendars): fix float type pane + position keys (we migrated these improperly in the past), just use + the default value + + Fixes #53087 + 2004-02-18 Rodrigo Moya <rodrigo@ximian.com> * gui/alarm-notify/alarm-notify.c (free_client_hash): remove the client @@ -136,9 +144,11 @@ * Convert the calendar_config_get_timezone and icaltimezone_get_builtin_timezone pair to just - calendar_config_get_icaltimezone, this guarantees we will have - some timezone + calendar_config_get_icaltimezone, this also guarantees we will + have some timezone (even if its just UTC) + Fixes #53754 + 2004-02-05 JP Rosevear <jpr@ximian.com> * gui/calendar-config.h: add proto diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index b735460d2e..a960e10e0a 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -33,6 +33,7 @@ #include <libecal/e-cal.h> #include <e-util/e-bconf-map.h> #include <e-util/e-folder-map.h> +#include "calendar-config-keys.h" #include "migration.h" static e_gconf_map_t calendar_display_map[] = { @@ -602,6 +603,30 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis e_source_list_sync (calendar_component_peek_source_list (component), NULL); } + if (minor == 5 && revision < 5) { + GConfClient *gconf; + GConfValue *gconf_val; + int i; + const char *keys[] = { + CALENDAR_CONFIG_HPANE_POS, + CALENDAR_CONFIG_VPANE_POS, + CALENDAR_CONFIG_MONTH_HPANE_POS, + CALENDAR_CONFIG_MONTH_VPANE_POS, + NULL + }; + + gconf = gconf_client_get_default (); + + for (i = 0; keys[i]; i++) { + gconf_val = gconf_client_get (gconf, keys[i], NULL); + if (gconf_val->type != GCONF_VALUE_INT) + gconf_client_unset (gconf, keys[i], NULL); + gconf_value_free (gconf_val); + } + + g_object_unref (gconf); + } + } return retval; |