From 282c3c4b4968fe95c83b35cd24b7907f5f63971d Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 12 Jan 2012 15:12:14 +0100
Subject: [PATCH] ges: only use glib constructs as required in configure.ac

---
 ges/ges-pitivi-formatter.c | 15 ++++++++++-----
 ges/ges-timeline-layer.c   | 12 ++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ges/ges-pitivi-formatter.c b/ges/ges-pitivi-formatter.c
index a70a3be..5a5740d 100644
--- a/ges/ges-pitivi-formatter.c
+++ b/ges/ges-pitivi-formatter.c
@@ -70,14 +70,16 @@ free_src_map (SrcMapping * srcmap)
 {
   g_free (srcmap->id);
   g_object_unref (srcmap->obj);
-  g_list_free_full (srcmap->tck_obj_ids, (GDestroyNotify) g_free);
+  g_list_foreach (srcmap->tck_obj_ids, (GFunc) g_free, NULL);
+  g_list_free (srcmap->tck_obj_ids);
   g_slice_free (SrcMapping, srcmap);
 }
 
 static void
 list_table_destroyer (gpointer key, gpointer value, void *unused)
 {
-  g_list_free_full (value, g_free);
+  g_list_foreach (value, (GFunc) g_free, NULL);
+  g_list_free (value);
 }
 
 /* Object functions */
@@ -359,7 +361,8 @@ save_tracks (GESTimeline * timeline, xmlTextWriterPtr writer,
     xmlTextWriterEndElement (writer);
   }
 
-  g_list_free_full (tracks, g_object_unref);
+  g_list_foreach (tracks, (GFunc) g_object_unref, NULL);
+  g_list_free (tracks);
   xmlTextWriterEndElement (writer);
 }
 
@@ -420,7 +423,8 @@ save_sources (GESPitiviFormatter * formatter, GList * layers,
         source_list = g_list_append (source_list, srcmap);
       }
     }
-    g_list_free_full (tlobjects, g_object_unref);
+    g_list_foreach (tlobjects, (GFunc) g_object_unref, NULL);
+    g_list_free (tlobjects);
     g_object_unref (G_OBJECT (layer));
   }
 
@@ -540,7 +544,8 @@ create_tracks (GESFormatter * self)
         priv->trackv = track;
       }
     }
-    g_list_free_full (tracks, g_object_unref);
+    g_list_foreach (tracks, (GFunc) g_object_unref, NULL);
+    g_list_free (tracks);
     return TRUE;
   }
 
diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c
index 65ffefe..28acebf 100644
--- a/ges/ges-timeline-layer.c
+++ b/ges/ges-timeline-layer.c
@@ -502,7 +502,8 @@ calculate_next_transition (GESTrackObject * track_object,
     calculate_next_transition_with_list (track_object, tckobjs_in_layer, layer);
   }
 
-  g_list_free_full (tckobjs_in_layer, g_object_unref);
+  g_list_foreach (tckobjs_in_layer, (GFunc) g_object_unref, NULL);
+  g_list_free (tckobjs_in_layer);
 }
 
 static void
@@ -535,7 +536,8 @@ calculate_transitions (GESTrackObject * track_object)
   calculate_next_transition_with_list (track_object, tckobjs_in_layer, layer);
 
 done:
-  g_list_free_full (tckobjs_in_layer, g_object_unref);
+  g_list_foreach (tckobjs_in_layer, (GFunc) g_object_unref, NULL);
+  g_list_free (tckobjs_in_layer);
 }
 
 
@@ -746,7 +748,8 @@ look_for_transition (GESTrackObject * track_object, GESTimelineLayer * layer)
           ges_track_object_get_timeline_object (tmp->data));
     }
   }
-  g_list_free_full (track_objects, g_object_unref);
+  g_list_foreach (track_objects, (GFunc) g_object_unref, NULL);
+  g_list_free (track_objects);
 }
 
 static gboolean
@@ -798,7 +801,8 @@ ges_timeline_layer_remove_object (GESTimelineLayer * layer,
       look_for_transition (tmp->data, layer);
     }
 
-    g_list_free_full (trackobjects, g_object_unref);
+    g_list_foreach (trackobjects, (GFunc) g_object_unref, NULL);
+    g_list_free (trackobjects);
   }
 
   g_hash_table_foreach_remove (layer->priv->signal_table,
-- 
2.7.4