glib r6847 - in branches/glib-2-16: . glib

[federico svn gnome org]

Author: federico
Date: Wed Apr  9 21:22:12 2008
New Revision: 6847
URL: http://svn.gnome.org/viewvc/glib?rev=6847&view=rev

Log:
Don't leak apps_by_name in GBookmarkFile metadata items
2008-04-09  Federico Mena Quintero  <federico novell com>

	Merged from trunk:

	* glib/gbookmarkfile.c (bookmark_metadata_free): Don't leak
	the apps_by_name hash table if the applications list is empty.

Signed-off-by: Federico Mena Quintero <federico gnu org>


Modified:
   branches/glib-2-16/ChangeLog
   branches/glib-2-16/glib/gbookmarkfile.c

Modified: branches/glib-2-16/glib/gbookmarkfile.c
==============================================================================
--- branches/glib-2-16/glib/gbookmarkfile.c	(original)
+++ branches/glib-2-16/glib/gbookmarkfile.c	Wed Apr  9 21:22:12 2008
@@ -325,10 +325,10 @@
 		      (GFunc) bookmark_app_info_free,
 		      NULL);
       g_list_free (metadata->applications);
-      
-      g_hash_table_destroy (metadata->apps_by_name);
     }
-  
+
+  g_hash_table_destroy (metadata->apps_by_name);
+
   g_free (metadata->icon_href);
   g_free (metadata->icon_mime);