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

Revert questionable changes.

Browse Source 
2006-01-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkbindings.h (struct _GtkBindingSignal): Revert questionable
	changes.

	* gtk/gtkbindings.c: Use the slice allocator and allocate signal
	and arguments in one block.
This commit is contained in:
Matthias Clasen
2006-01-05 04:21:09 +00:00
committed by Matthias Clasen
parent b43a41e77a
commit 6441a62967
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2006-01-04 Matthias Clasen <mclasen@redhat.com> 2006-01-04 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbindings.h (struct _GtkBindingSignal): Revert questionable
changes.
* gtk/gtkbindings.c: Use the slice allocator and allocate signal
and arguments in one block.
* gtk/gtkuimanager.c (gtk_ui_manager_get_toplevels): Don't return * gtk/gtkuimanager.c (gtk_ui_manager_get_toplevels): Don't return
a list of NULLs. (#325723, Steve Chaplin) a list of NULLs. (#325723, Steve Chaplin)

6
ChangeLog.pre-2-10
View File

@ -1,5 +1,11 @@
2006-01-04 Matthias Clasen <mclasen@redhat.com> 2006-01-04 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbindings.h (struct _GtkBindingSignal): Revert questionable
changes.
* gtk/gtkbindings.c: Use the slice allocator and allocate signal
and arguments in one block.
* gtk/gtkuimanager.c (gtk_ui_manager_get_toplevels): Don't return * gtk/gtkuimanager.c (gtk_ui_manager_get_toplevels): Don't return
a list of NULLs. (#325723, Steve Chaplin) a list of NULLs. (#325723, Steve Chaplin)

9
gtk/gtkbindings.c
View File

@ -65,10 +65,11 @@ binding_signal_new (const gchar *signal_name,
{ {
GtkBindingSignal *signal; GtkBindingSignal *signal;
signal = (GtkBindingSignal *) g_malloc0 (sizeof (GtkBindingSignal) + (n_args > 0 ? n_args - 1 : 0) * sizeof (GtkBindingArg)); signal = (GtkBindingSignal *) g_slice_alloc0 (sizeof (GtkBindingSignal) + n_args * sizeof (GtkBindingArg));
signal->next = NULL; signal->next = NULL;
signal->signal_name = (gchar *)g_intern_string (signal_name); signal->signal_name = (gchar *)g_intern_string (signal_name);
signal->n_args = n_args; signal->n_args = n_args;
signal->args = (GtkBindingArg *)(signal + 1);
return signal; return signal;
} }
@ -83,7 +84,7 @@ binding_signal_free (GtkBindingSignal *sig)
if (G_TYPE_FUNDAMENTAL (sig->args[i].arg_type) == G_TYPE_STRING) if (G_TYPE_FUNDAMENTAL (sig->args[i].arg_type) == G_TYPE_STRING)
g_free (sig->args[i].d.string_data); g_free (sig->args[i].d.string_data);
} }
g_free (sig); g_slice_free1 (sizeof (GtkBindingSignal) + sig->n_args * sizeof (GtkBindingArg), sig);
} }
static guint static guint
@ -769,7 +770,7 @@ gtk_binding_entry_add_signal (GtkBindingSet *binding_set,
{ {
GtkBindingArg *arg; GtkBindingArg *arg;
arg = g_new0 (GtkBindingArg, 1); arg = g_slice_new0 (GtkBindingArg);
slist = g_slist_prepend (slist, arg); slist = g_slist_prepend (slist, arg);
arg->arg_type = va_arg (args, GtkType); arg->arg_type = va_arg (args, GtkType);
@ -828,7 +829,7 @@ gtk_binding_entry_add_signal (GtkBindingSet *binding_set,
free_slist = slist; free_slist = slist;
while (slist) while (slist)
{ {
g_free (slist->data); g_slice_free (GtkBindingArg, slist->data);
slist = slist->next; slist = slist->next;
} }
g_slist_free (free_slist); g_slist_free (free_slist);

2
gtk/gtkbindings.h
View File

@ -89,7 +89,7 @@ struct _GtkBindingSignal
GtkBindingSignal *next; GtkBindingSignal *next;
gchar *signal_name; gchar *signal_name;
guint n_args; guint n_args;
GtkBindingArg args[1]; /* flexible array */ GtkBindingArg *args;
}; };
/* Application-level methods */ /* Application-level methods */