evolution r36274 - trunk/plugins/mark-all-read

[msuman svn gnome org]

Author: msuman
Date: Mon Sep  8 03:31:26 2008
New Revision: 36274
URL: http://svn.gnome.org/viewvc/evolution?rev=36274&view=rev

Log:
Patch from Paul Bolle <pebolle tiscali nl> ** Fixes bug #550415 (Fixes a memory leak of CamelFolderInfo).

Modified:
   trunk/plugins/mark-all-read/ChangeLog
   trunk/plugins/mark-all-read/mark-all-read.c

Modified: trunk/plugins/mark-all-read/mark-all-read.c
==============================================================================
--- trunk/plugins/mark-all-read/mark-all-read.c	(original)
+++ trunk/plugins/mark-all-read/mark-all-read.c	Mon Sep  8 03:31:26 2008
@@ -223,19 +223,17 @@
 	gint response;
 	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST;
 
-	camel_exception_init (&ex);
-
 	/* FIXME we have to disable the menu item */
 	if (!folder)
 		return;
 
+	camel_exception_init (&ex);
+
 	store = folder->parent_store;
 	info = camel_store_get_folder_info (store, folder->full_name, flags, &ex);
 
-	if (camel_exception_is_set (&ex)) {
-		camel_exception_clear (&ex);
-		return;
-	}
+	if (camel_exception_is_set (&ex))
+		goto out;
 
 	if (info && (info->child || info->next))
 		response = prompt_user ();
@@ -246,6 +244,8 @@
 		mark_all_as_read (folder);
 	else if (response == GTK_RESPONSE_YES)
 		mar_all_sub_folders (store, info, &ex);
+out:
+	camel_store_free_folder_info(store, info);
 }
 
 static void