Apply a cleanup patch by Kjartan Maraas (#341812)

[~andy/gtk] / gtk / gtktreedatalist.c

diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index 6c1714ebfe2b4634a527c1c44b81d36cef0fdd61..f9c4c3f6335125f1ca27068e3a6c451be8811bdd 100644 (file)
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -21,11 +21,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktreedatalist.h"
+#include "gtkalias.h"
 #include <string.h>
-static GMemChunk *tree_chunk = NULL;
-#define TREE_CHUNK_PREALLOCS 64
 
 /* node allocation
  */
@@ -34,14 +32,7 @@ _gtk_tree_data_list_alloc (void)
 {
   GtkTreeDataList *list;
 
-  if (tree_chunk == NULL)
-    tree_chunk = g_mem_chunk_new ("treedatalist mem chunk",
-                                 sizeof (GtkTreeDataList),
-                                 sizeof (GtkTreeDataList) * TREE_CHUNK_PREALLOCS,
-                                 G_ALLOC_AND_FREE);
-
-  list = g_chunk_new (GtkTreeDataList, tree_chunk);
-  memset (list, 0, sizeof (GtkTreeDataList));
+  list = g_slice_new0 (GtkTreeDataList);
 
   return list;
 }
@@ -65,7 +56,7 @@ _gtk_tree_data_list_free (GtkTreeDataList *list,
       else if (g_type_is_a (column_headers [i], G_TYPE_BOXED) && tmp->data.v_pointer != NULL)
        g_boxed_free (column_headers [i], (gpointer) tmp->data.v_pointer);
 
-      g_mem_chunk_free (tree_chunk, tmp);
+      g_slice_free (GtkTreeDataList, tmp);
       i++;
       tmp = next;
     }
@@ -75,7 +66,7 @@ gboolean
 _gtk_tree_data_list_check_type (GType type)
 {
   gint i = 0;
-  static GType type_list[] =
+  static const GType type_list[] =
   {
     G_TYPE_BOOLEAN,
     G_TYPE_CHAR,
@@ -110,7 +101,21 @@ _gtk_tree_data_list_check_type (GType type)
   return FALSE;
 }
 
+static inline GType
+get_fundamental_type (GType type)
+{
+  GType result;
+
+  result = G_TYPE_FUNDAMENTAL (type);
+
+  if (result == G_TYPE_INTERFACE)
+    {
+      if (g_type_is_a (type, G_TYPE_OBJECT))
+       result = G_TYPE_OBJECT;
+    }
 
+  return result;
+}
 void
 _gtk_tree_data_list_node_to_value (GtkTreeDataList *list,
                                   GType            type,
@@ -118,7 +123,7 @@ _gtk_tree_data_list_node_to_value (GtkTreeDataList *list,
 {
   g_value_init (value, type);
 
-  switch (G_TYPE_FUNDAMENTAL (type))
+  switch (get_fundamental_type (type))
     {
     case G_TYPE_BOOLEAN:
       g_value_set_boolean (value, (gboolean) list->data.v_int);
@@ -181,7 +186,7 @@ void
 _gtk_tree_data_list_value_to_node (GtkTreeDataList *list,
                                   GValue          *value)
 {
-  switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value)))
+  switch (get_fundamental_type (G_VALUE_TYPE (value)))
     {
     case G_TYPE_BOOLEAN:
       list->data.v_int = g_value_get_boolean (value);
@@ -257,7 +262,7 @@ _gtk_tree_data_list_node_copy (GtkTreeDataList *list,
   new_list = _gtk_tree_data_list_alloc ();
   new_list->next = NULL;
 
-  switch (G_TYPE_FUNDAMENTAL (type))
+  switch (get_fundamental_type (type))
     {
     case G_TYPE_BOOLEAN:
     case G_TYPE_CHAR:
@@ -279,6 +284,7 @@ _gtk_tree_data_list_node_copy (GtkTreeDataList *list,
       new_list->data.v_pointer = g_strdup (list->data.v_pointer);
       break;
     case G_TYPE_OBJECT:
+    case G_TYPE_INTERFACE:
       new_list->data.v_pointer = list->data.v_pointer;
       if (new_list->data.v_pointer)
        g_object_ref (new_list->data.v_pointer);
@@ -298,10 +304,10 @@ _gtk_tree_data_list_node_copy (GtkTreeDataList *list,
 }
 
 gint
-gtk_tree_data_list_compare_func (GtkTreeModel *model,
-                                GtkTreeIter  *a,
-                                GtkTreeIter  *b,
-                                gpointer      user_data)
+_gtk_tree_data_list_compare_func (GtkTreeModel *model,
+                                 GtkTreeIter  *a,
+                                 GtkTreeIter  *b,
+                                 gpointer      user_data)
 {
   gint column = GPOINTER_TO_INT (user_data);
   GType type = gtk_tree_model_get_column_type (model, column);
@@ -313,7 +319,7 @@ gtk_tree_data_list_compare_func (GtkTreeModel *model,
   gtk_tree_model_get_value (model, a, column, &a_value);
   gtk_tree_model_get_value (model, b, column, &b_value);
 
-  switch (G_TYPE_FUNDAMENTAL (type))
+  switch (get_fundamental_type (type))
     {
     case G_TYPE_BOOLEAN:
       if (g_value_get_boolean (&a_value) < g_value_get_boolean (&b_value))
@@ -456,11 +462,11 @@ _gtk_tree_data_list_header_new (gint   n_columns,
     {
       GtkTreeDataSortHeader *header;
 
-      header = g_new (GtkTreeDataSortHeader, 1);
+      header = g_slice_new (GtkTreeDataSortHeader);
 
       retval = g_list_prepend (retval, header);
       header->sort_column_id = i;
-      header->func = gtk_tree_data_list_compare_func;
+      header->func = _gtk_tree_data_list_compare_func;
       header->destroy = NULL;
       header->data = GINT_TO_POINTER (i);
     }
@@ -484,14 +490,14 @@ _gtk_tree_data_list_header_free (GList *list)
          d (header->data);
        }
 
-      g_free (header);
+      g_slice_free (GtkTreeDataSortHeader, header);
     }
   g_list_free (list);
 }
 
 GtkTreeDataSortHeader *
-_gtk_tree_data_list_get_header (GList *header_list,
-                               gint   sort_column_id)
+_gtk_tree_data_list_get_header (GList   *header_list,
+                               gint     sort_column_id)
 {
   GtkTreeDataSortHeader *header = NULL;
 
@@ -503,3 +509,50 @@ _gtk_tree_data_list_get_header (GList *header_list,
     }
   return NULL;
 }
+
+
+GList *
+_gtk_tree_data_list_set_header (GList                  *header_list,
+                               gint                    sort_column_id,
+                               GtkTreeIterCompareFunc  func,
+                               gpointer                data,
+                               GtkDestroyNotify        destroy)
+{
+  GList *list = header_list;
+  GtkTreeDataSortHeader *header = NULL;
+
+  for (; list; list = list->next)
+    {
+      header = (GtkTreeDataSortHeader*) list->data;
+      if (header->sort_column_id == sort_column_id)
+       break;
+      header = NULL;
+
+      if (list->next == NULL)
+       break;
+    }
+  
+  if (header == NULL)
+    {
+      header = g_slice_new0 (GtkTreeDataSortHeader);
+      header->sort_column_id = sort_column_id;
+      if (list)
+       list = g_list_append (list, header);
+      else
+       header_list = g_list_append (header_list, header);
+    }
+
+  if (header->destroy)
+    {
+      GtkDestroyNotify d = header->destroy;
+      
+      header->destroy = NULL;
+      d (header->data);
+    }
+  
+  header->func = func;
+  header->data = data;
+  header->destroy = destroy;
+
+  return header_list;
+}