diff options
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 14 |
2 files changed, 9 insertions, 15 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ad5a7da3a7..7e339fddfc 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,4 +1,10 @@ - 2004-01-12 Gary Ekker <gekker@novell.com> +2004-01-13 Rodrigo Moya <rodrigo@ximian.com> + + * gui/calendar-component.c (impl_upgradeFromVersion): free 'base_uri' + at the end of the function, or it will leak, and removed duplicated + code to create the birthdays backend. + +2004-01-12 Gary Ekker <gekker@novell.com> * gui/Makefile.am: add e-pub-utils.[ch] for Free/Busy publishing @@ -60,7 +66,7 @@ (init_calendar_publishing_cb): ditto (conf_changed_callback): ditto (impl_createControls): ditto - + 2004-01-12 Rodrigo Moya <rodrigo@ximian.com> * gui/calendar-component.c (impl_upgradeFromVersion): sync the source diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index ddcff4165c..0726ee9ccc 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -567,8 +567,6 @@ impl_upgradeFromVersion (PortableServer_Servant servant, g_free (new_dir); } - g_free (base_uri); - /* create the remote source group */ group = e_source_group_new (_("On The Web"), "webcal://"); e_source_list_add_group (priv->source_list, group, -1); @@ -588,17 +586,7 @@ impl_upgradeFromVersion (PortableServer_Servant servant, e_source_list_sync (priv->source_list, NULL); } - /* create calendar for birthdays & anniversaries */ - if ((major < 0) || - ((major == 1) && (minor < 5)) || - ((major == 1) && (minor == 5) && (revision < 2))) { - group = e_source_group_new (_("Birthdays"), "contacts://"); - source = e_source_new (_("Birthdays & Anniversaries"), "/"); - e_source_group_add_source (group, source, -1); - e_source_group_set_readonly (group, TRUE); - e_source_list_add_group (priv->source_list, group, -1); - e_source_list_sync (priv->source_list, NULL); - } + g_free (base_uri); return CORBA_TRUE; } |