Translation updated by Ivar Smolin.

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

diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index 301022ebc99c7958bde2d53f93dc6144be48d4f6..a70a53d8205858a459b94d996d06de3435fc80ab 100644 (file)
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -20,7 +20,9 @@
  * do not use it.
  */
 
+#include <config.h>
 #include "gtktreedatalist.h"
+#include "gtkalias.h"
 #include <string.h>
 static GMemChunk *tree_chunk = NULL;
 #define TREE_CHUNK_PREALLOCS 64
@@ -59,7 +61,7 @@ _gtk_tree_data_list_free (GtkTreeDataList *list,
       if (g_type_is_a (column_headers [i], G_TYPE_STRING))
        g_free ((gchar *) tmp->data.v_pointer);
       else if (g_type_is_a (column_headers [i], G_TYPE_OBJECT) && tmp->data.v_pointer != NULL)
-       g_object_unref (G_OBJECT (tmp->data.v_pointer));
+       g_object_unref (tmp->data.v_pointer);
       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);
 
@@ -73,7 +75,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,
@@ -108,7 +110,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,
@@ -116,7 +132,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);
@@ -179,7 +195,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);
@@ -255,7 +271,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:
@@ -277,9 +293,10 @@ _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 (G_OBJECT (new_list->data.v_pointer));
+       g_object_ref (new_list->data.v_pointer);
       break;
     case G_TYPE_BOXED:
       if (list->data.v_pointer)
@@ -296,10 +313,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);
@@ -311,12 +328,12 @@ 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_int (&a_value) < g_value_get_int (&b_value))
+      if (g_value_get_boolean (&a_value) < g_value_get_boolean (&b_value))
        retval = -1;
-      else if (g_value_get_int (&a_value) == g_value_get_int (&b_value))
+      else if (g_value_get_boolean (&a_value) == g_value_get_boolean (&b_value))
        retval = 0;
       else
        retval = 1;
@@ -458,7 +475,7 @@ _gtk_tree_data_list_header_new (gint   n_columns,
 
       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);
     }