Forgot to namespace this.

Fri Mar 23 16:13:43 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace
	this.

	* gtk/gtktreestore.c (gtk_tree_store_set_value): change from
	set_cell to set_value

	* gtk/gtkliststore.c (gtk_list_store_set_value): change from
	set_cell to set_value

diff --git a/ChangeLog b/ChangeLog
index 57ec76369ebba67c60ecd6d8a2a8d64210d28fa8..3580ad38d0f3ce2b51b7d17ebd81b73cab2424c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Mar 23 16:13:43 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace
+       this.
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_value): change from
+       set_cell to set_value
+
+       * gtk/gtkliststore.c (gtk_list_store_set_value): change from
+       set_cell to set_value
+
 Thu Mar 22 19:27:34 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 57ec76369ebba67c60ecd6d8a2a8d64210d28fa8..3580ad38d0f3ce2b51b7d17ebd81b73cab2424c6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Fri Mar 23 16:13:43 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace
+       this.
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_value): change from
+       set_cell to set_value
+
+       * gtk/gtkliststore.c (gtk_list_store_set_value): change from
+       set_cell to set_value
+
 Thu Mar 22 19:27:34 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 57ec76369ebba67c60ecd6d8a2a8d64210d28fa8..3580ad38d0f3ce2b51b7d17ebd81b73cab2424c6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Fri Mar 23 16:13:43 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace
+       this.
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_value): change from
+       set_cell to set_value
+
+       * gtk/gtkliststore.c (gtk_list_store_set_value): change from
+       set_cell to set_value
+
 Thu Mar 22 19:27:34 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 57ec76369ebba67c60ecd6d8a2a8d64210d28fa8..3580ad38d0f3ce2b51b7d17ebd81b73cab2424c6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Fri Mar 23 16:13:43 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace
+       this.
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_value): change from
+       set_cell to set_value
+
+       * gtk/gtkliststore.c (gtk_list_store_set_value): change from
+       set_cell to set_value
+
 Thu Mar 22 19:27:34 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 57ec76369ebba67c60ecd6d8a2a8d64210d28fa8..3580ad38d0f3ce2b51b7d17ebd81b73cab2424c6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Fri Mar 23 16:13:43 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace
+       this.
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_value): change from
+       set_cell to set_value
+
+       * gtk/gtkliststore.c (gtk_list_store_set_value): change from
+       set_cell to set_value
+
 Thu Mar 22 19:27:34 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 57ec76369ebba67c60ecd6d8a2a8d64210d28fa8..3580ad38d0f3ce2b51b7d17ebd81b73cab2424c6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Fri Mar 23 16:13:43 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace
+       this.
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_value): change from
+       set_cell to set_value
+
+       * gtk/gtkliststore.c (gtk_list_store_set_value): change from
+       set_cell to set_value
+
 Thu Mar 22 19:27:34 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 57ec76369ebba67c60ecd6d8a2a8d64210d28fa8..3580ad38d0f3ce2b51b7d17ebd81b73cab2424c6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Fri Mar 23 16:13:43 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace
+       this.
+
+       * gtk/gtktreestore.c (gtk_tree_store_set_value): change from
+       set_cell to set_value
+
+       * gtk/gtkliststore.c (gtk_list_store_set_value): change from
+       set_cell to set_value
+
 Thu Mar 22 19:27:34 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 92de43a1ad73dd00aefbddc40269aeea1a35a549..e3153e52e89213d0b0e0dae76b77d681ee703eef 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -225,6 +225,7 @@ gtk_list_store_init (GtkListStore *list_store)
   list_store->sort_list = NULL;
   list_store->stamp = g_random_int ();
   list_store->length = 0;
+  list_store->sort_column_id = -1;
 }
 
 /**
@@ -563,7 +564,7 @@ gtk_list_store_iter_parent (GtkTreeModel *tree_model,
  */
 
 /**
- * gtk_list_store_set_cell:
+ * gtk_list_store_set_value:
  * @store: a #GtkListStore
  * @iter: iterator for the row you're modifying
  * @column: column number to modify
@@ -575,10 +576,10 @@ gtk_list_store_iter_parent (GtkTreeModel *tree_model,
  * 
  **/
 void
-gtk_list_store_set_cell (GtkListStore *list_store,
-                        GtkTreeIter  *iter,
-                        gint          column,
-                        GValue       *value)
+gtk_list_store_set_value (GtkListStore *list_store,
+                         GtkTreeIter  *iter,
+                         gint          column,
+                         GValue       *value)
 {
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
@@ -713,10 +714,10 @@ gtk_list_store_set_valist (GtkListStore *list_store,
          break;
        }
 
-      gtk_list_store_set_cell (list_store,
-                              iter,
-                              column,
-                              &value);
+      gtk_list_store_set_value (list_store,
+                               iter,
+                               column,
+                               &value);
 
       g_value_unset (&value);
 

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 5ab9a8d14400bf62b30a6a0a2bfbd8ecad8b6d98..13eb37a61ccac3a3a55bac0a0541ede70e5e9bd3 100644 (file)
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -55,20 +55,6 @@ struct _GtkListStore
 struct _GtkListStoreClass
 {
   GObjectClass parent_class;
-
-  /* signals */
-  /* Will be moved into the GtkTreeModelIface eventually */
-  void (* changed)           (GtkTreeModel *tree_model,
-                             GtkTreePath  *path,
-                             GtkTreeIter  *iter);
-  void (* inserted)          (GtkTreeModel *tree_model,
-                             GtkTreePath  *path,
-                             GtkTreeIter  *iter);
-  void (* has_child_toggled) (GtkTreeModel *tree_model,
-                             GtkTreePath  *path,
-                             GtkTreeIter  *iter);
-  void (* deleted)           (GtkTreeModel *tree_model,
-                             GtkTreePath  *path);
 };
 
 
@@ -81,7 +67,7 @@ void          gtk_list_store_set_n_columns   (GtkListStore *store,
 void          gtk_list_store_set_column_type (GtkListStore *store,
                                              gint          column,
                                              GType         type);
-void          gtk_list_store_set_cell        (GtkListStore *store,
+void          gtk_list_store_set_value       (GtkListStore *store,
                                              GtkTreeIter  *iter,
                                              gint          column,
                                              GValue       *value);

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index a4cba08a83bec24c60ee769757e49add3cad6da1..7ae33b88ae5f34a61b3bccb1b458c0fccc262837 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -597,10 +597,10 @@ gtk_tree_store_iter_parent (GtkTreeModel *tree_model,
  * manipulations on it's own.
  */
 void
-gtk_tree_store_set_cell (GtkTreeStore *tree_store,
-                        GtkTreeIter  *iter,
-                        gint          column,
-                        GValue       *value)
+gtk_tree_store_set_value (GtkTreeStore *tree_store,
+                         GtkTreeIter  *iter,
+                         gint          column,
+                         GValue       *value)
 {
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
@@ -733,10 +733,10 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store,
          break;
        }
 
-      gtk_tree_store_set_cell (tree_store,
-                              iter,
-                              column,
-                              &value);
+      gtk_tree_store_set_value (tree_store,
+                               iter,
+                               column,
+                               &value);
 
       g_value_unset (&value);
 

diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index d38ca5a5518060b62654901c3b0ec39d8819b4e0..6076cdbf535a56541f6a8f6629910c470a06e994 100644 (file)
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -64,7 +64,7 @@ void          gtk_tree_store_set_n_columns   (GtkTreeStore *tree_store,
 void          gtk_tree_store_set_column_type (GtkTreeStore *store,
                                              gint          column,
                                              GType         type);
-void          gtk_tree_store_set_cell        (GtkTreeStore *tree_store,
+void          gtk_tree_store_set_value       (GtkTreeStore *tree_store,
                                              GtkTreeIter  *iter,
                                              gint          column,
                                              GValue       *value);

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index e7347ce07f2f466e743d0bbe56742cbd3419af2c..528035c167ce0d5ab834e51bf3afa8337adf17dd 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -778,7 +778,7 @@ gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column,
  **/
 void
 gtk_tree_view_column_set_cell_data_func (GtkTreeViewColumn *tree_column,
-                                        CellDataFunc       func,
+                                        GtkCellDataFunc    func,
                                         gpointer           func_data,
                                         GtkDestroyNotify   destroy)
 {

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 5de559147dc5431c88a9eb1ad11a38f8ac352b44..36677c2da5138646c73e74af1918302c2db17bfc 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -45,11 +45,11 @@ typedef enum
 typedef struct _GtkTreeViewColumn      GtkTreeViewColumn;
 typedef struct _GtkTreeViewColumnClass GtkTreeViewColumnClass;
 
-typedef void (* CellDataFunc) (GtkTreeViewColumn *tree_column,
-                              GtkCellRenderer   *cell,
-                              GtkTreeModel      *tree_model,
-                              GtkTreeIter       *iter,
-                              gpointer           data);
+typedef void (* GtkCellDataFunc) (GtkTreeViewColumn *tree_column,
+                                 GtkCellRenderer   *cell,
+                                 GtkTreeModel      *tree_model,
+                                 GtkTreeIter       *iter,
+                                 gpointer           data);
 
   
 struct _GtkTreeViewColumn
@@ -71,7 +71,7 @@ struct _GtkTreeViewColumn
   gint max_width;
   gint displayed_width;
 
-  CellDataFunc func;
+  GtkCellDataFunc func;
   gpointer func_data;
   GtkDestroyNotify destroy;
   gchar *title;
@@ -107,7 +107,7 @@ void               gtk_tree_view_column_add_attribute       (GtkTreeViewColumn
 void               gtk_tree_view_column_set_attributes      (GtkTreeViewColumn     *tree_column,
                                                             ...);
 void               gtk_tree_view_column_set_cell_data_func  (GtkTreeViewColumn     *tree_column,
-                                                            CellDataFunc           func,
+                                                            GtkCellDataFunc        func,
                                                             gpointer               func_data,
                                                             GtkDestroyNotify       destroy);
 void               gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn     *tree_column);