Update class_n_properties after installing color-hash, since other classes

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

	* gtk/gtksettings.c (gtk_settings_class_init): Update
	class_n_properties after installing color-hash, since
	other classes install settings, too.

	* gtk/gtkctree.c:
	* gtk/gtkclist.c: Fix some mistakes in the conversion
	from mem chunks to slice allocator.

diff --git a/ChangeLog b/ChangeLog
index 5f3f4bc9acd0541bcac2ff6e5510ba226217e793..3b8879bfd3562824da8849fd45cd2162c5a2576c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-12-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksettings.c (gtk_settings_class_init): Update
+       class_n_properties after installing color-hash, since
+       other classes install settings, too.
+
+       * gtk/gtkctree.c: 
+       * gtk/gtkclist.c: Fix some mistakes in the conversion
+       from mem chunks to slice allocator.
+
        * gtk/gtkiconview.c (adjust_wrap_width): Adjust the 
        wrap-width also if an explicit item width is set.  
        (#322475, Alex Graveley)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5f3f4bc9acd0541bcac2ff6e5510ba226217e793..3b8879bfd3562824da8849fd45cd2162c5a2576c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,13 @@
 2005-12-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksettings.c (gtk_settings_class_init): Update
+       class_n_properties after installing color-hash, since
+       other classes install settings, too.
+
+       * gtk/gtkctree.c: 
+       * gtk/gtkclist.c: Fix some mistakes in the conversion
+       from mem chunks to slice allocator.
+
        * gtk/gtkiconview.c (adjust_wrap_width): Adjust the 
        wrap-width also if an explicit item width is set.  
        (#322475, Alex Graveley)

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 71f2ddbfea6be4e15a0247c133ab919d264f4f90..22129cd3b7d999e364dda94172d3f9a8a1235776 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -6349,7 +6349,7 @@ row_new (GtkCList *clist)
   GtkCListRow *clist_row;
 
   clist_row = g_slice_new (GtkCListRow);
-  clist_row->cell = g_slice_new (GtkCell);
+  clist_row->cell = g_slice_alloc (sizeof (GtkCell) * clist->columns);
 
   for (i = 0; i < clist->columns; i++)
     {
@@ -6398,7 +6398,7 @@ row_delete (GtkCList    *clist,
   if (clist_row->destroy)
     clist_row->destroy (clist_row->data);
 
-  g_slice_free (GtkCell, clist_row->cell);
+  g_slice_free1 (sizeof (GtkCell) * clist->columns, clist_row->cell);
   g_slice_free (GtkCListRow, clist_row);
 }
 

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 86845d7d777c451d9f6c1cb0d3e0f5bcb6360b97..226e484ef977383fe2d8b98c834d77a0bd7f52e1 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -3196,7 +3196,7 @@ row_new (GtkCTree *ctree)
 
   clist = GTK_CLIST (ctree);
   ctree_row = g_slice_new (GtkCTreeRow);
-  ctree_row->row.cell = g_slice_new (GtkCell);
+  ctree_row->row.cell = g_slice_alloc (sizeof (GtkCell) * clist->columns);
 
   for (i = 0; i < clist->columns; i++)
     {
@@ -3282,7 +3282,7 @@ row_delete (GtkCTree    *ctree,
       dnotify (ddata);
     }
 
-  g_slice_free (GtkCell, ctree_row->row.cell);
+  g_slice_free1 (sizeof (GtkCell) * clist->columns, ctree_row->row.cell);
   g_slice_free (GtkCListRow, ctree_row);
 }
 

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 1199c452e3752bcc7065711684a49beef0ecc4e1..a0a10ef75ae32e2667483216dd595829fcfcc05d 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -211,7 +211,6 @@ gtk_settings_class_init (GtkSettingsClass *class)
   gobject_class->notify = gtk_settings_notify;
 
   quark_property_parser = g_quark_from_static_string ("gtk-rc-property-parser");
-
   result = settings_install_property_parser (class,
                                              g_param_spec_int ("gtk-double-click-time",
                                                                P_("Double Click Time"),
@@ -481,6 +480,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
 
   g_assert (result == PROP_ENABLE_ANIMATIONS);
 
+
   /**
    * GtkSettings:color-hash:
    *
@@ -496,6 +496,9 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                       P_("A hash table resentation of the color scheme."),
                                                       G_TYPE_HASH_TABLE,
                                                       GTK_PARAM_READABLE));
+
+  class_n_properties++;
+  
 }
 
 static void