evolution r35717 - in trunk: addressbook addressbook/gui/component calendar calendar/gui

[mcrha svn gnome org]

Author: mcrha
Date: Thu Jul  3 09:32:25 2008
New Revision: 35717
URL: http://svn.gnome.org/viewvc/evolution?rev=35717&view=rev

Log:
2008-07-03  Milan Crha  <mcrha redhat com>

	** 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.



Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/component/addressbook-component.c
   trunk/calendar/ChangeLog
   trunk/calendar/gui/calendar-component.c
   trunk/calendar/gui/memos-component.c
   trunk/calendar/gui/tasks-component.c

Modified: trunk/addressbook/gui/component/addressbook-component.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-component.c	(original)
+++ trunk/addressbook/gui/component/addressbook-component.c	Thu Jul  3 09:32:25 2008
@@ -151,6 +151,7 @@
 		/* 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);
 
 		e_source_set_property (source, "completion", "true");
 
@@ -164,8 +165,7 @@
 
 		on_ldap_servers = group;
 	}
-	if (personal_source)
-		g_object_unref (personal_source);
+
 	g_free (base_uri_proto);
 	g_free (base_uri);
 }

Modified: trunk/calendar/gui/calendar-component.c
==============================================================================
--- trunk/calendar/gui/calendar-component.c	(original)
+++ trunk/calendar/gui/calendar-component.c	Thu Jul  3 09:32:25 2008
@@ -247,6 +247,7 @@
 		/* 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 @@
 	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 @@
 
 	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);
 }

Modified: trunk/calendar/gui/memos-component.c
==============================================================================
--- trunk/calendar/gui/memos-component.c	(original)
+++ trunk/calendar/gui/memos-component.c	Thu Jul  3 09:32:25 2008
@@ -208,6 +208,7 @@
 		/* 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 ();
 

Modified: trunk/calendar/gui/tasks-component.c
==============================================================================
--- trunk/calendar/gui/tasks-component.c	(original)
+++ trunk/calendar/gui/tasks-component.c	Thu Jul  3 09:32:25 2008
@@ -204,6 +204,7 @@
 		/* 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 ();