[cairo-commit] roadster/src Makefile.am, 1.26, 1.27 gfreelist.c, 1.1, NONE gfreelist.h, 1.1, NONE map.c, 1.57, 1.58 map.h, 1.29, 1.30

[Ian McIntosh]

Committed by: ian

Update of /cvs/cairo/roadster/src
In directory gabe:/tmp/cvs-serv23866/src

Modified Files:
	Makefile.am map.c map.h 
Removed Files:
	gfreelist.c gfreelist.h 
Log Message:
	* src/map.c: Switch from gfreelist to g_new and g_free for the list of selected POI (currently not really used).
	* src/gfreelist.h:
	* src/gfreelist.c: Removed.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/roadster/src/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am	20 Oct 2005 06:56:22 -0000	1.26
+++ Makefile.am	26 Oct 2005 02:52:09 -0000	1.27
@@ -52,7 +52,6 @@
 	glyph.c\
 	road.c\
 	animator.c\
-	gfreelist.c\
 	tooltipwindow.c\
 	test_poly.c
 

--- gfreelist.c DELETED ---

--- gfreelist.h DELETED ---

Index: map.c
===================================================================
RCS file: /cvs/cairo/roadster/src/map.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- map.c	18 Oct 2005 06:40:20 -0000	1.57
+++ map.c	26 Oct 2005 02:52:09 -0000	1.58
@@ -195,7 +195,6 @@
 
 	// init POI selection
 	pMap->pLocationSelectionArray = g_ptr_array_new();
-	pMap->pLocationSelectionAllocator = g_free_list_new(sizeof(locationselection_t), 100);
 
 	// save it
 	*ppMap = pMap;
@@ -563,8 +562,7 @@
 	}
 
 	// create a new locationselection_t and initialize it
-	locationselection_t* pNew = g_free_list_alloc(pMap->pLocationSelectionAllocator);
-
+	locationselection_t* pNew = g_new0(locationselection_t, 1);
 	pNew->nLocationID = nLocationID;
 	pNew->pAttributesArray = g_ptr_array_new();
 

Index: map.h
===================================================================
RCS file: /cvs/cairo/roadster/src/map.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- map.h	18 Oct 2005 06:40:20 -0000	1.29
+++ map.h	26 Oct 2005 02:52:09 -0000	1.30
@@ -25,7 +25,6 @@
 #define _MAP_H_
 
 #include <math.h>
-#include "gfreelist.h"
 
 //
 // Map Object Types
@@ -220,7 +219,6 @@
 	GHashTable		*pLocationArrayHashTable;
 
 	GPtrArray		*pLocationSelectionArray;
-	GFreeList		*pLocationSelectionAllocator;
 
 	GdkPixmap* pPixmap;