Fix a stupid typo. (gtk_list_store_set_cell): Fix a stupid typo.

Sat Mar 10 12:15:31 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreestore.c (gtk_tree_store_set_cell): Fix a stupid typo.
	(gtk_list_store_set_cell): Fix a stupid typo.

diff --git a/ChangeLog b/ChangeLog
index 154483afe48a889ec2aaca51190cde9a71e52c44..c77fae7948579b185852d495c147ae2b052d2fdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 10 12:15:31 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_cell): Fix a stupid typo.
+       (gtk_list_store_set_cell): Fix a stupid typo.
+
 Fri Mar  9 20:36:21 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_select_all): Make

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 154483afe48a889ec2aaca51190cde9a71e52c44..c77fae7948579b185852d495c147ae2b052d2fdd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sat Mar 10 12:15:31 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_cell): Fix a stupid typo.
+       (gtk_list_store_set_cell): Fix a stupid typo.
+
 Fri Mar  9 20:36:21 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_select_all): Make

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 154483afe48a889ec2aaca51190cde9a71e52c44..c77fae7948579b185852d495c147ae2b052d2fdd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Mar 10 12:15:31 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_cell): Fix a stupid typo.
+       (gtk_list_store_set_cell): Fix a stupid typo.
+
 Fri Mar  9 20:36:21 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_select_all): Make

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 154483afe48a889ec2aaca51190cde9a71e52c44..c77fae7948579b185852d495c147ae2b052d2fdd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Mar 10 12:15:31 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_cell): Fix a stupid typo.
+       (gtk_list_store_set_cell): Fix a stupid typo.
+
 Fri Mar  9 20:36:21 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_select_all): Make

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 154483afe48a889ec2aaca51190cde9a71e52c44..c77fae7948579b185852d495c147ae2b052d2fdd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Mar 10 12:15:31 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_cell): Fix a stupid typo.
+       (gtk_list_store_set_cell): Fix a stupid typo.
+
 Fri Mar  9 20:36:21 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_select_all): Make

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 154483afe48a889ec2aaca51190cde9a71e52c44..c77fae7948579b185852d495c147ae2b052d2fdd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Mar 10 12:15:31 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_cell): Fix a stupid typo.
+       (gtk_list_store_set_cell): Fix a stupid typo.
+
 Fri Mar  9 20:36:21 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_select_all): Make

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 154483afe48a889ec2aaca51190cde9a71e52c44..c77fae7948579b185852d495c147ae2b052d2fdd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Mar 10 12:15:31 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_cell): Fix a stupid typo.
+       (gtk_list_store_set_cell): Fix a stupid typo.
+
 Fri Mar  9 20:36:21 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_select_all): Make

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 123308d07e68e94974ce201ff22d85a562606f07..560c634046e43177800aa48bb1de0590296710df 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -549,15 +549,15 @@ gtk_list_store_set_cell (GtkListStore *list_store,
   g_return_if_fail (column >= 0 && column < list_store->n_columns);
   g_return_if_fail (value != NULL);
 
-  if (! g_type_is_a (G_VALUE_TYPE (value), column->type))
+  if (! g_type_is_a (G_VALUE_TYPE (value), list_store->column_headers[column]))
     {
-      if (! (g_value_type_compatible (G_VALUE_TYPE (value), column->type) &&
-            g_value_type_compatible (column->type, G_VALUE_TYPE (value))))
+      if (! (g_value_type_compatible (G_VALUE_TYPE (value), list_store->column_headers[column]) &&
+            g_value_type_compatible (list_store->column_headers[column], G_VALUE_TYPE (value))))
        {
          g_warning ("%s: Unable to convert from %s to %s\n",
                     G_STRLOC,
                     g_type_name (G_VALUE_TYPE (value)),
-                    g_type_name (column->type));
+                    g_type_name (list_store->column_headers[column]));
          return;
        }
       if (!g_value_transform (value, &real_value))
@@ -565,7 +565,7 @@ gtk_list_store_set_cell (GtkListStore *list_store,
          g_warning ("%s: Unable to make conversion from %s to %s\n",
                     G_STRLOC,
                     g_type_name (G_VALUE_TYPE (value)),
-                    g_type_name (column->type));
+                    g_type_name (list_store->column_headers[column]));
          g_value_unset (&real_value);
          return;
        }
@@ -616,7 +616,7 @@ gtk_list_store_set_cell (GtkListStore *list_store,
 
   path = gtk_list_store_get_path (GTK_TREE_MODEL (list_store), iter);
   if (converted)
-    _gtk_tree_data_list_value_to_node (list, real_value);
+    _gtk_tree_data_list_value_to_node (list, &real_value);
   else
     _gtk_tree_data_list_value_to_node (list, value);
   gtk_tree_model_changed (GTK_TREE_MODEL (list_store), path, iter);

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index f632ed346009de715060d0d47eb570c2e29bf3dc..c2e4b9601e858c89eb546c32e52ea136cdf152df 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -565,15 +565,15 @@ gtk_tree_store_set_cell (GtkTreeStore *tree_store,
   g_return_if_fail (column >= 0 && column < tree_store->n_columns);
   g_return_if_fail (value != NULL);
 
-  if (! g_type_is_a (G_VALUE_TYPE (value), column->type))
+  if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column]))
     {
-      if (! (g_value_type_compatible (G_VALUE_TYPE (value), column->type) &&
-            g_value_type_compatible (column->type, G_VALUE_TYPE (value))))
+      if (! (g_value_type_compatible (G_VALUE_TYPE (value), tree_store->column_headers[column]) &&
+            g_value_type_compatible (tree_store->column_headers[column], G_VALUE_TYPE (value))))
        {
          g_warning ("%s: Unable to convert from %s to %s\n",
                     G_STRLOC,
                     g_type_name (G_VALUE_TYPE (value)),
-                    g_type_name (column->type));
+                    g_type_name (tree_store->column_headers[column]));
          return;
        }
       if (!g_value_transform (value, &real_value))
@@ -581,7 +581,7 @@ gtk_tree_store_set_cell (GtkTreeStore *tree_store,
          g_warning ("%s: Unable to make conversion from %s to %s\n",
                     G_STRLOC,
                     g_type_name (G_VALUE_TYPE (value)),
-                    g_type_name (column->type));
+                    g_type_name (tree_store->column_headers[column]));
          g_value_unset (&real_value);
          return;
        }
@@ -631,7 +631,7 @@ gtk_tree_store_set_cell (GtkTreeStore *tree_store,
       column --;
     }
   if (converted)
-    _gtk_tree_data_list_value_to_node (list, real_value);
+    _gtk_tree_data_list_value_to_node (list, &real_value);
   else
     _gtk_tree_data_list_value_to_node (list, value);
   gtk_tree_model_changed (GTK_TREE_MODEL (tree_store), path, iter);