From: Emmanuel Rodriguez <emmanuel.rodriguez@gmail.com>
Date: Wed, 6 May 2009 06:01:37 +0000 (+0200)
Subject: Removed some memory leaks in build_combo_box()
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1a9a42036873c48e9bc881cbfdf1f58ca7edf01;p=libchamplain

Removed some memory leaks in build_combo_box()
---

diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c
index e5253c0..3e05184 100644
--- a/demos/launcher-gtk.c
+++ b/demos/launcher-gtk.c
@@ -131,7 +131,7 @@ static void
 build_combo_box (GtkComboBox *box)
 {
   ChamplainMapSourceFactory *factory;
-  GSList *sources;
+  GSList *sources, *iter;
   gint i = 0;
   GtkTreeStore *store;
   GtkTreeIter parent;
@@ -143,18 +143,19 @@ build_combo_box (GtkComboBox *box)
 
   factory = champlain_map_source_factory_get_default ();
   sources = champlain_map_source_factory_get_list (factory);
-
-  while (sources != NULL)
+  
+  iter = sources;
+  while (iter != NULL)
   {
     ChamplainMapSourceDesc *desc;
 
-    desc = (ChamplainMapSourceDesc*) sources->data;
+    desc = (ChamplainMapSourceDesc*) iter->data;
 
-    gtk_tree_store_append( store, &parent, NULL );
-    gtk_tree_store_set( store, &parent, COL_ID, g_strdup (desc->id),
-        COL_NAME, g_strdup (desc->name), -1);
+    gtk_tree_store_append (store, &parent, NULL );
+    gtk_tree_store_set (store, &parent, COL_ID, desc->id,
+        COL_NAME, desc->name, -1);
 
-    sources = g_slist_next (sources);
+    iter = g_slist_next (iter);
   }
 
   g_slist_free (sources);