callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update class_n_properties after installing color-hash, since other classes

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2005-12-21 21:05:22 +00:00 committed by Matthias Clasen
parent 95d8688bf3
commit 2962480b2c
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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)

8
ChangeLog.pre-2-10
View File

@ -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)

4
gtk/gtkclist.c
View File

@ -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);
}

4
gtk/gtkctree.c
View File

@ -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);
}

5
gtk/gtksettings.c
View File

@ -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