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

guard against multiple destroys

Browse Source 
2003-05-14  JP Rosevear  <jpr@ximian.com>

	* e-combo-button.c (impl_destroy): guard against multiple destroys

2003-05-14  JP Rosevear  <jpr@ximian.com>

	* menus/gal-view-menus.c (gvm_finalize): unref the component

svn path=/trunk/; revision=21178
This commit is contained in:
JP Rosevear
2003-05-14 18:42:38 +00:00
committed by JP Rosevear
parent bd1f703edb
commit d49d8a2f15
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
widgets/ChangeLog
View File

@ -1,3 +1,7 @@
2003-05-14 JP Rosevear <jpr@ximian.com>
* menus/gal-view-menus.c (gvm_finalize): unref the component
2003-05-13 Ettore Perazzoli <ettore@ximian.com> 2003-05-13 Ettore Perazzoli <ettore@ximian.com>
* menus/gal-view-menus.c (gal_view_menus_unmerge): Guard against * menus/gal-view-menus.c (gal_view_menus_unmerge): Guard against

3
widgets/menus/gal-view-menus.c
View File

@ -148,6 +148,9 @@ gvm_finalize (GObject *object)
gal_view_menus_unmerge (gvm, NULL); gal_view_menus_unmerge (gvm, NULL);
if (gvm->priv->component)
bonobo_object_unref (gvm->priv->component);
if (gvm->priv->define_views_dialog) if (gvm->priv->define_views_dialog)
g_object_weak_unref (G_OBJECT (gvm->priv->define_views_dialog), clear_define_views_dialog, gvm); g_object_weak_unref (G_OBJECT (gvm->priv->define_views_dialog), clear_define_views_dialog, gvm);

4
widgets/misc/ChangeLog
View File

@ -1,3 +1,7 @@
2003-05-14 JP Rosevear <jpr@ximian.com>
* e-combo-button.c (impl_destroy): guard against multiple destroys
2003-05-13 Ettore Perazzoli <ettore@ximian.com> 2003-05-13 Ettore Perazzoli <ettore@ximian.com>
[#42628] [#42628]

25
widgets/misc/e-combo-button.c
View File

@ -248,18 +248,21 @@ impl_destroy (GtkObject *object)
combo_button = E_COMBO_BUTTON (object); combo_button = E_COMBO_BUTTON (object);
priv = combo_button->priv; priv = combo_button->priv;
if (priv->arrow_pixmap != NULL) { if (priv) {
gtk_widget_destroy (priv->arrow_pixmap); if (priv->arrow_pixmap != NULL) {
priv->arrow_pixmap = NULL; gtk_widget_destroy (priv->arrow_pixmap);
priv->arrow_pixmap = NULL;
}
if (priv->icon != NULL) {
g_object_unref (priv->icon);
priv->icon = NULL;
}
g_free (priv);
combo_button->priv = NULL;
} }
if (priv->icon != NULL) {
g_object_unref (priv->icon);
priv->icon = NULL;
}
g_free (priv);
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object); (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }