Re: [evolution-patches] shell, camel, addressbook, calendar leaks

[Dan Winship <danw ximian com>]

Committed the camel patch to both branches.

Still waiting to hear back about the addressbook patch.

Attaching new shell patch with one more fix and new calendar patch
addressing the problem Rodrigo pointed out (I think) and also adding
some more leak fixes.


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1286
diff -u -r1.1286 ChangeLog
--- ChangeLog	25 Jun 2003 16:52:18 -0000	1.1286
+++ ChangeLog	1 Jul 2003 18:50:30 -0000
@@ -1,3 +1,14 @@
+2003-07-01  Dan Winship  <danw ximian com>
+
+	* e-shell-user-creatable-items-handler.c (free_menu_items): free
+	the folder_type
+
+	* e-splash.c (e_splash_new): Unref the pixbuf.
+
+	* evolution-shell-component.c (impl_finalize): Add some missing
+	frees.
+	(user_creatable_item_type_free): free the tooltip
+
 2003-06-25  Chris Toshok  <toshok ximian com>
 
 	* e-config-upgrade.c: add general_map and a reference to it in
Index: e-shell-user-creatable-items-handler.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-user-creatable-items-handler.c,v
retrieving revision 1.28
diff -u -r1.28 e-shell-user-creatable-items-handler.c
--- e-shell-user-creatable-items-handler.c	14 May 2003 18:39:21 -0000	1.28
+++ e-shell-user-creatable-items-handler.c	1 Jul 2003 18:50:31 -0000
@@ -251,6 +251,7 @@
 			g_object_unref (item->icon);
 
 		g_free (item->component_id);
+		g_free (item->folder_type);
 
 		g_free (item);
 	}
Index: e-splash.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-splash.c,v
retrieving revision 1.32
diff -u -r1.32 e-splash.c
--- e-splash.c	2 Apr 2003 03:41:57 -0000	1.32
+++ e-splash.c	1 Jul 2003 18:50:32 -0000
@@ -379,7 +379,7 @@
 	new = g_object_new (e_splash_get_type (), NULL);
 	e_splash_construct (new, splash_image_pixbuf);
 
-	/* g_object_unref (splash_image_pixbuf); */
+	g_object_unref (splash_image_pixbuf);
 
 	return GTK_WIDGET (new);
 }
Index: evolution-shell-component.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/evolution-shell-component.c,v
retrieving revision 1.87
diff -u -r1.87 evolution-shell-component.c
--- evolution-shell-component.c	25 Apr 2003 17:33:20 -0000	1.87
+++ evolution-shell-component.c	1 Jul 2003 18:50:33 -0000
@@ -136,6 +136,7 @@
 	g_free (type->id);
 	g_free (type->description);
 	g_free (type->menu_description);
+	g_free (type->tooltip);
 	g_free (type->folder_type);
 
 	if (type->icon != NULL)
@@ -820,6 +821,8 @@
 
 		g_free (folder_type->name);
 		g_free (folder_type->icon_name);
+		g_free (folder_type->display_name);
+		g_free (folder_type->description);
 		g_strfreev (folder_type->exported_dnd_types);
 		g_strfreev (folder_type->accepted_dnd_types);
 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1808
diff -u -r1.1808 ChangeLog
--- ChangeLog	1 Jul 2003 02:31:28 -0000	1.1808
+++ ChangeLog	1 Jul 2003 19:10:09 -0000
@@ -1,3 +1,15 @@
+2003-07-01  Dan Winship  <danw ximian com>
+
+	* cal-client/cal-client.c (real_open_calendar): Don't leak
+	exceptions
+	(load_static_capabilities): free the capability string
+
+	* gui/dialogs/task-page.c (task_page_fill_component): Free the
+	description text if it *was* set, rather than if it wasn't.
+
+	* gui/dialogs/task-editor.c (task_editor_finalize): Free the priv
+	struct.
+
 2003-07-01  Bolian Yin <bolian yin sun com>
 
        Fixes #45274
Index: cal-client/cal-client.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/cal-client/cal-client.c,v
retrieving revision 1.120
diff -u -r1.120 cal-client.c
--- cal-client/cal-client.c	30 Jun 2003 14:36:47 -0000	1.120
+++ cal-client/cal-client.c	1 Jul 2003 19:10:11 -0000
@@ -839,10 +839,15 @@
 		GNOME_Evolution_Calendar_CalFactory_open (f->data, str_uri,
 							  only_if_exists,
 							  corba_listener, &ev);
-		if (!BONOBO_EX (&ev))
-			break;
-		else if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod))
+		if (!BONOBO_EX (&ev)) {
+			if (supported != NULL)
+				*supported = TRUE;
+			return TRUE;
+		}
+
+		if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod))
 			unsupported++;
+		CORBA_exception_free (&ev);
 	}
 
 	if (supported != NULL) {
@@ -852,17 +857,13 @@
 			*supported = TRUE;
 	}
 	
-	if (BONOBO_EX (&ev)) {
-		bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-		priv->listener = NULL;
-		priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-		g_free (priv->uri);
-		priv->uri = NULL;
+	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
+	priv->listener = NULL;
+	priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
+	g_free (priv->uri);
+	priv->uri = NULL;
 
-		return FALSE;
-	}
-
-	return TRUE;
+	return FALSE;
 }
 
 /**
@@ -1213,6 +1214,8 @@
 		priv->capabilities = g_strdup (cap);
 	else
 		priv->capabilities = g_strdup ("");	
+
+	CORBA_free (cap);
 	CORBA_exception_free (&ev);
 }
 
Index: gui/dialogs/task-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-editor.c,v
retrieving revision 1.64
diff -u -r1.64 task-editor.c
--- gui/dialogs/task-editor.c	29 Jun 2003 19:29:46 -0000	1.64
+++ gui/dialogs/task-editor.c	1 Jul 2003 19:10:11 -0000
@@ -346,12 +346,14 @@
 	te = TASK_EDITOR (object);
 	priv = te->priv;
 
-	g_object_unref((priv->task_page));
-	g_object_unref((priv->task_details_page));
-	g_object_unref((priv->meet_page));
+	g_object_unref (priv->task_page);
+	g_object_unref (priv->task_details_page);
+	g_object_unref (priv->meet_page);
 	
 	g_object_unref (priv->model);
 	
+	g_free (priv);
+
 	if (G_OBJECT_CLASS (parent_class)->finalize)
 		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
Index: gui/dialogs/task-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-page.c,v
retrieving revision 1.43
diff -u -r1.43 task-page.c
--- gui/dialogs/task-page.c	11 Apr 2003 14:15:40 -0000	1.43
+++ gui/dialogs/task-page.c	1 Jul 2003 19:10:12 -0000
@@ -464,7 +464,7 @@
 		cal_component_set_description_list (comp, &l);
 	}
 
-	if (!str)
+	if (str)
 		g_free (str);
 
 	/* Dates */