From caa0a3d44c74e440d5de07f770583491549edb82 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 3 Jul 2008 09:32:25 +0000 Subject: ** Fix for bug #540152 2008-07-03 Milan Crha ** Fix for bug #540152 * addressbook/gui/component/addressbook-component.c: (ensure_sources): Unref source only when we created it - the list owns the pointer now. * calendar/gui/calendar-component.c: (ensure_sources): Unref sources only when we created it - the list owns the pointer now. * calendar/gui/tasks-component.c: (ensure_sources): * calendar/gui/memos-component.c: (ensure_sources): Do not leak ESource. svn path=/trunk/; revision=35717 --- calendar/gui/calendar-component.c | 7 ++----- calendar/gui/memos-component.c | 1 + calendar/gui/tasks-component.c | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index dc5645b530..4916bccfeb 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -247,6 +247,7 @@ ensure_sources (CalendarComponent *component) /* Create the default Person addressbook */ personal_source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); e_source_group_add_source (on_this_computer, personal_source, -1); + g_object_unref (personal_source); calendars_selected = calendar_config_get_calendars_selected (); if (!primary_calendar && !calendars_selected) { @@ -295,6 +296,7 @@ ensure_sources (CalendarComponent *component) if (!birthdays_source) { birthdays_source = e_source_new (_("Birthdays & Anniversaries"), "/"); e_source_group_add_source (contacts, birthdays_source, -1); + g_object_unref (birthdays_source); } if (!e_source_get_property (birthdays_source, "delete")) @@ -312,11 +314,6 @@ ensure_sources (CalendarComponent *component) component->priv->source_list = source_list; - if (personal_source) - g_object_unref (personal_source); - if (birthdays_source) - g_object_unref (birthdays_source); - g_free (base_uri_proto); g_free (base_uri); } diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 941862a6af..df17624f75 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -208,6 +208,7 @@ ensure_sources (MemosComponent *component) /* Create the default Person addressbook */ ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); e_source_group_add_source (on_this_computer, source, -1); + g_object_unref (source); memos_selected = calendar_config_get_memos_selected (); diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 28a2fd9964..61363fa02b 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -204,6 +204,7 @@ ensure_sources (TasksComponent *component) /* Create the default Person addressbook */ ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); e_source_group_add_source (on_this_computer, source, -1); + g_object_unref (source); tasks_selected = calendar_config_get_tasks_selected (); -- cgit v1.2.3