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

Bug #655625 - Crash in atk_state_set_contains_state

Browse Source
This commit is contained in:
Milan Crha
2011-09-26 12:30:06 +02:00
committed by Rodrigo Moya
parent 5fb2bb4edf
commit 17cd0cb7df
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
widgets/table/gal-a11y-e-table-click-to-add-factory.h
View File

@ -25,7 +25,7 @@
#include <atk/atkobjectfactory.h>
#define GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY (gal_a11y_e_table_item_factory_get_type ())
#define GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY (gal_a11y_e_table_item_click_to_add_factory_get_type ())
#define GAL_A11Y_E_TABLE_CLICK_TO_ADD_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY, GalA11yETableClickToAddFactory))
#define GAL_A11Y_E_TABLE_CLICK_TO_ADD_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY, GalA11yETableClickToAddFactoryClass))
#define GAL_A11Y_IS_E_TABLE_CLICK_TO_ADD_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY))

17
widgets/table/gal-a11y-e-table-item.c
View File

@ -54,6 +54,7 @@ static GQuark quark_accessible_object = 0;
#define PARENT_TYPE (parent_type)
struct _GalA11yETableItemPrivate {
ETableItem *item;
gint cols;
gint rows;
gint selection_change_id;
@ -77,20 +78,18 @@ item_finalized (gpointer user_data,
GalA11yETableItem *a11y;
GalA11yETableItemPrivate *priv;
/* XXX GalA11yETableItem may already be finalized.
* Just work around it for now. */
if (!GAL_A11Y_IS_E_TABLE_ITEM (user_data))
return;
a11y = GAL_A11Y_E_TABLE_ITEM (user_data);
priv = GET_PRIVATE (a11y);
priv->item = NULL;
atk_state_set_add_state (priv->state_set, ATK_STATE_DEFUNCT);
atk_object_notify_state_change (ATK_OBJECT (a11y), ATK_STATE_DEFUNCT, TRUE);
if (priv->selection)
gal_a11y_e_table_item_unref_selection (a11y);
g_object_unref (a11y);
}
static AtkStateSet *
@ -224,6 +223,11 @@ eti_dispose (GObject *object)
priv->columns = NULL;
}
if (priv->item) {
g_object_weak_unref (G_OBJECT (priv->item), item_finalized, a11y);
priv->item = NULL;
}
if (parent_class->dispose)
parent_class->dispose (object);
}
@ -1102,6 +1106,7 @@ gal_a11y_e_table_item_new (ETableItem *item)
accessible = ATK_OBJECT (a11y);
GET_PRIVATE (a11y)->item = item;
/* Initialize cell data. */
GET_PRIVATE (a11y)->cols = item->cols;
GET_PRIVATE (a11y)->rows = item->rows;
@ -1143,7 +1148,7 @@ gal_a11y_e_table_item_new (ETableItem *item)
}
if (item)
g_object_weak_ref (G_OBJECT (item), item_finalized, a11y);
g_object_weak_ref (G_OBJECT (item), item_finalized, g_object_ref (a11y));
esm = item->selection;