Make it compile against GLib 2.9:

2005-12-06  Matthias Clasen  <mclasen@redhat.com>

	Make it compile against GLib 2.9:

	* gtk/gtkclist.h:
	* gtk/gtkstatusbar.h: Replace uses of GMemChunk* in public
	headers by gpointer.

	* gtk/gtkclist.c:
	* gtk/gtkctree.c:
	* gtk/gtkstatusbar.c: Add GMemChunk* casts as necessary.

7 files changed, 41 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 1fec28d21..c6b2907fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+	Make it compile against GLib 2.9:
+	
+	* gtk/gtkclist.h:
+	* gtk/gtkstatusbar.h: Replace uses of GMemChunk* in public 
+	headers by gpointer.
+
+	* gtk/gtkclist.c:
+	* gtk/gtkctree.c:
+	* gtk/gtkstatusbar.c: Add GMemChunk* casts as necessary.
+	
 2005-12-05  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1fec28d21..c6b2907fc 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2005-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+	Make it compile against GLib 2.9:
+	
+	* gtk/gtkclist.h:
+	* gtk/gtkstatusbar.h: Replace uses of GMemChunk* in public 
+	headers by gpointer.
+
+	* gtk/gtkclist.c:
+	* gtk/gtkctree.c:
+	* gtk/gtkstatusbar.c: Add GMemChunk* casts as necessary.
+	
 2005-12-05  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 547b2496e..36450ce24 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -4439,8 +4439,8 @@ gtk_clist_finalize (GObject *object)
 
   columns_delete (clist);
 
-  g_mem_chunk_destroy (clist->cell_mem_chunk);
-  g_mem_chunk_destroy (clist->row_mem_chunk);
+  g_mem_chunk_destroy ((GMemChunk *)clist->cell_mem_chunk);
+  g_mem_chunk_destroy ((GMemChunk *)clist->row_mem_chunk);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -6375,8 +6375,8 @@ row_new (GtkCList *clist)
   int i;
   GtkCListRow *clist_row;
 
-  clist_row = g_chunk_new (GtkCListRow, clist->row_mem_chunk);
-  clist_row->cell = g_chunk_new (GtkCell, clist->cell_mem_chunk);
+  clist_row = g_chunk_new (GtkCListRow, (GMemChunk *)clist->row_mem_chunk);
+  clist_row->cell = g_chunk_new (GtkCell, (GMemChunk *)clist->cell_mem_chunk);
 
   for (i = 0; i < clist->columns; i++)
     {
@@ -6425,8 +6425,8 @@ row_delete (GtkCList    *clist,
   if (clist_row->destroy)
     clist_row->destroy (clist_row->data);
 
-  g_mem_chunk_free (clist->cell_mem_chunk, clist_row->cell);
-  g_mem_chunk_free (clist->row_mem_chunk, clist_row);
+  g_mem_chunk_free ((GMemChunk *)clist->cell_mem_chunk, clist_row->cell);
+  g_mem_chunk_free ((GMemChunk *)clist->row_mem_chunk, clist_row);
 }
 
 /* FOCUS FUNCTIONS
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 6d5ca31a7..311fa6e0e 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -152,8 +152,8 @@ struct _GtkCList
   guint16 flags;
   
   /* mem chunks */
-  GMemChunk *row_mem_chunk;
-  GMemChunk *cell_mem_chunk;
+  gpointer row_mem_chunk;
+  gpointer cell_mem_chunk;
 
   guint freeze_count;
   
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 2cf10aaea..487c3bc80 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -3205,8 +3205,8 @@ row_new (GtkCTree *ctree)
   int i;
 
   clist = GTK_CLIST (ctree);
-  ctree_row = g_chunk_new (GtkCTreeRow, clist->row_mem_chunk);
-  ctree_row->row.cell = g_chunk_new (GtkCell, clist->cell_mem_chunk);
+  ctree_row = g_chunk_new (GtkCTreeRow, (GMemChunk *)clist->row_mem_chunk);
+  ctree_row->row.cell = g_chunk_new (GtkCell, (GMemChunk *)clist->cell_mem_chunk);
 
   for (i = 0; i < clist->columns; i++)
     {
@@ -3292,8 +3292,8 @@ row_delete (GtkCTree    *ctree,
       dnotify (ddata);
     }
 
-  g_mem_chunk_free (clist->cell_mem_chunk, ctree_row->row.cell);
-  g_mem_chunk_free (clist->row_mem_chunk, ctree_row);
+  g_mem_chunk_free ((GMemChunk *)clist->cell_mem_chunk, ctree_row->row.cell);
+  g_mem_chunk_free ((GMemChunk *)clist->row_mem_chunk, ctree_row);
 }
 
 static void
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 8f4eb93a8..f3407f3b0 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -302,7 +302,7 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
   g_return_val_if_fail (text != NULL, 0);
 
   class = GTK_STATUSBAR_GET_CLASS (statusbar);
-  msg = g_chunk_new (GtkStatusbarMsg, class->messages_mem_chunk);
+  msg = g_chunk_new (GtkStatusbarMsg, (GMemChunk *)class->messages_mem_chunk);
   msg->text = g_strdup (text);
   msg->context_id = context_id;
   msg->message_id = statusbar->seq_message_id++;
@@ -343,7 +343,7 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
 	      statusbar->messages = g_slist_remove_link (statusbar->messages,
 							 list);
 	      g_free (msg->text);
-	      g_mem_chunk_free (class->messages_mem_chunk, msg);
+	      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
 	      g_slist_free_1 (list);
 	      break;
 	    }
@@ -394,7 +394,7 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
 	      class = GTK_STATUSBAR_GET_CLASS (statusbar);
 	      statusbar->messages = g_slist_remove_link (statusbar->messages, list);
 	      g_free (msg->text);
-	      g_mem_chunk_free (class->messages_mem_chunk, msg);
+	      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
 	      g_slist_free_1 (list);
 	      
 	      break;
@@ -459,7 +459,7 @@ gtk_statusbar_destroy (GtkObject *object)
 
       msg = list->data;
       g_free (msg->text);
-      g_mem_chunk_free (class->messages_mem_chunk, msg);
+      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
     }
   g_slist_free (statusbar->messages);
   statusbar->messages = NULL;
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index 91f4d15aa..388c80714 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -65,7 +65,7 @@ struct _GtkStatusbarClass
 {
   GtkHBoxClass parent_class;
 
-  GMemChunk *messages_mem_chunk;
+  gpointer messages_mem_chunk;
 
   void	(*text_pushed)	(GtkStatusbar	*statusbar,
 			 guint		 context_id,