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

gtk/gtkclist.c gtk/gtkcontainer.c gtk/gtkfilechooserbutton.c

Browse Source 
2008-08-07  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkclist.c
	* gtk/gtkcontainer.c
	* gtk/gtkfilechooserbutton.c
	* gtk/gtkgamma.c
	* gtk/gtkmenutoolbutton.c
	* gtk/gtkoptionmenu.c
	* gtk/gtkradiobutton.c
	* gtk/gtkradiomenuitem.c
	* gtk/gtktipsquery.c
	* gtk/gtktree.c
	* gtk/gtktreeview.c: chain up unconditionally in destroy().

	* gtk/gtkhandlebox.c: remove empty destroy() implementation.


svn path=/trunk/; revision=21035
This commit is contained in:
Michael Natterer 2008-08-07 14:12:32 +00:00 committed by Michael Natterer
parent 141af56c43
commit 8371b465dc
13 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2008-08-07 Michael Natterer <mitch@imendio.com>
* gtk/gtkclist.c
* gtk/gtkcontainer.c
* gtk/gtkfilechooserbutton.c
* gtk/gtkgamma.c
* gtk/gtkmenutoolbutton.c
* gtk/gtkoptionmenu.c
* gtk/gtkradiobutton.c
* gtk/gtkradiomenuitem.c
* gtk/gtktipsquery.c
* gtk/gtktree.c
* gtk/gtktreeview.c: chain up unconditionally in destroy().
* gtk/gtkhandlebox.c: remove empty destroy() implementation.
2008-08-07 Michael Natterer <mitch@imendio.com> 2008-08-07 Michael Natterer <mitch@imendio.com>
Bug 546756 – gnome-panel crashed with SIGSEGV in Bug 546756 – gnome-panel crashed with SIGSEGV in

3
gtk/gtkclist.c
View File

@ -4402,8 +4402,7 @@ gtk_clist_destroy (GtkObject *object)
clist->column[i].button = NULL; clist->column[i].button = NULL;
} }
if (GTK_OBJECT_CLASS (parent_class)->destroy) GTK_OBJECT_CLASS (parent_class)->destroy (object);
(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }
static void static void

3
gtk/gtkcontainer.c
View File

@ -1021,8 +1021,7 @@ gtk_container_destroy (GtkObject *object)
gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL); gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL);
if (GTK_OBJECT_CLASS (parent_class)->destroy) GTK_OBJECT_CLASS (parent_class)->destroy (object);
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }
static void static void

3
gtk/gtkfilechooserbutton.c
View File

@ -954,8 +954,7 @@ gtk_file_chooser_button_destroy (GtkObject *object)
priv->fs = NULL; priv->fs = NULL;
} }
if (GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy != NULL) GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy (object);
(*GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy) (object);
} }

3
gtk/gtkgamma.c
View File

@ -485,8 +485,7 @@ gtk_gamma_curve_destroy (GtkObject *object)
if (c->gamma_dialog) if (c->gamma_dialog)
gtk_widget_destroy (c->gamma_dialog); gtk_widget_destroy (c->gamma_dialog);
if (GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy) GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy (object);
(* GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy) (object);
} }
#define __GTK_GAMMA_CURVE_C__ #define __GTK_GAMMA_CURVE_C__

12
gtk/gtkhandlebox.c
View File

@ -113,7 +113,6 @@ static void gtk_handle_box_get_property (GObject *object,
guint param_id, guint param_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gtk_handle_box_destroy (GtkObject *object);
static void gtk_handle_box_map (GtkWidget *widget); static void gtk_handle_box_map (GtkWidget *widget);
static void gtk_handle_box_unmap (GtkWidget *widget); static void gtk_handle_box_unmap (GtkWidget *widget);
static void gtk_handle_box_realize (GtkWidget *widget); static void gtk_handle_box_realize (GtkWidget *widget);
@ -152,12 +151,10 @@ static void
gtk_handle_box_class_init (GtkHandleBoxClass *class) gtk_handle_box_class_init (GtkHandleBoxClass *class)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
GtkObjectClass *object_class;
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class;
GtkContainerClass *container_class; GtkContainerClass *container_class;
gobject_class = (GObjectClass *) class; gobject_class = (GObjectClass *) class;
object_class = (GtkObjectClass *) class;
widget_class = (GtkWidgetClass *) class; widget_class = (GtkWidgetClass *) class;
container_class = (GtkContainerClass *) class; container_class = (GtkContainerClass *) class;
@ -214,8 +211,6 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
FALSE, FALSE,
GTK_PARAM_READABLE)); GTK_PARAM_READABLE));
object_class->destroy = gtk_handle_box_destroy;
widget_class->map = gtk_handle_box_map; widget_class->map = gtk_handle_box_map;
widget_class->unmap = gtk_handle_box_unmap; widget_class->unmap = gtk_handle_box_unmap;
widget_class->realize = gtk_handle_box_realize; widget_class->realize = gtk_handle_box_realize;
@ -347,13 +342,6 @@ gtk_handle_box_new (void)
return g_object_new (GTK_TYPE_HANDLE_BOX, NULL); return g_object_new (GTK_TYPE_HANDLE_BOX, NULL);
} }
static void
gtk_handle_box_destroy (GtkObject *object)
{
if (GTK_OBJECT_CLASS (gtk_handle_box_parent_class)->destroy)
(* GTK_OBJECT_CLASS (gtk_handle_box_parent_class)->destroy) (object);
}
static void static void
gtk_handle_box_map (GtkWidget *widget) gtk_handle_box_map (GtkWidget *widget)
{ {

3
gtk/gtkmenutoolbutton.c
View File

@ -424,8 +424,7 @@ gtk_menu_tool_button_destroy (GtkObject *object)
button); button);
} }
if (GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy) GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy (object);
(*GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy) (object);
} }
/** /**

3
gtk/gtkoptionmenu.c
View File

@ -377,8 +377,7 @@ gtk_option_menu_destroy (GtkObject *object)
if (option_menu->menu) if (option_menu->menu)
gtk_widget_destroy (option_menu->menu); gtk_widget_destroy (option_menu->menu);
if (GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy) GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy (object);
(* GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy) (object);
} }
static void static void

3
gtk/gtkradiobutton.c
View File

@ -385,8 +385,7 @@ gtk_radio_button_destroy (GtkObject *object)
if (was_in_group) if (was_in_group)
g_signal_emit (radio_button, group_changed_signal, 0); g_signal_emit (radio_button, group_changed_signal, 0);
if (GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy) GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy (object);
(* GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy) (object);
} }
static void static void

3
gtk/gtkradiomenuitem.c
View File

@ -411,8 +411,7 @@ gtk_radio_menu_item_destroy (GtkObject *object)
if (was_in_group) if (was_in_group)
g_signal_emit (radio_menu_item, group_changed_signal, 0); g_signal_emit (radio_menu_item, group_changed_signal, 0);
if (GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy) GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy (object);
(* GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy) (object);
} }
static void static void

3
gtk/gtktipsquery.c
View File

@ -265,8 +265,7 @@ gtk_tips_query_destroy (GtkObject *object)
g_free (tips_query->label_no_tip); g_free (tips_query->label_no_tip);
tips_query->label_no_tip = NULL; tips_query->label_no_tip = NULL;
if (GTK_OBJECT_CLASS (parent_class)->destroy) GTK_OBJECT_CLASS (parent_class)->destroy (object);
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }
GtkWidget* GtkWidget*

3
gtk/gtktree.c
View File

@ -409,8 +409,7 @@ gtk_tree_destroy (GtkObject *object)
tree->selection = NULL; tree->selection = NULL;
} }
if (GTK_OBJECT_CLASS (parent_class)->destroy) GTK_OBJECT_CLASS (parent_class)->destroy (object);
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }
static void static void

3
gtk/gtktreeview.c
View File

@ -1692,8 +1692,7 @@ gtk_tree_view_destroy (GtkObject *object)
tree_view->priv->vadjustment = NULL; tree_view->priv->vadjustment = NULL;
} }
if (GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy) GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy (object);
(* GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy) (object);
} }