From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Thu, 20 Sep 2007 16:06:18 +0000 (+0000)
Subject: * fix two memory leaks
X-Git-Tag: git_migration_finished~2323
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=c84a48ad1b62d73460103133c923c590bbe17564;hp=2f8f9e570328c3e806e71f9df15c7dc921acd19a

* fix two memory leaks

pmo-trunk-r3373
---

diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c
index 1344f13..b943d61 100644
--- a/src/maemo/modest-maemo-utils.c
+++ b/src/maemo/modest-maemo-utils.c
@@ -75,7 +75,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager)
 {
 	GtkWidget *main_menu;
 	GtkWidget *menubar;
-	GList *iter;
+	GList *children, *iter;
 
 	g_return_val_if_fail (ui_manager, NULL);
 	
@@ -85,7 +85,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager)
 	/* Get the menubar from the UI manager */
 	menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
 
-	iter = gtk_container_get_children (GTK_CONTAINER (menubar));
+	iter = children = gtk_container_get_children (GTK_CONTAINER (menubar));
 	while (iter) {
 		GtkWidget *menu;
 
@@ -94,6 +94,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager)
 
 		iter = g_list_next (iter);
 	}
+	g_list_free (children);
 	return main_menu;
 }
 
diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index 0dd04c9..019ab32 100644
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -357,11 +357,10 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 
 
 	if (subject && strlen (subject)) {
-		gchar * escaped_subject = NULL;
-
-		escaped_subject = g_markup_escape_text (subject, -1);
+		gchar* escaped_subject = g_markup_escape_text (subject, -1);
 		g_object_set (G_OBJECT (subject_cell), "markup",
 			      escaped_subject, NULL);
+		g_free (escaped_subject);
 	} else {
 		g_object_set (G_OBJECT (subject_cell), "markup",
 			      _("mail_va_no_subject"), NULL);