[gtk+] Return state_set directly if there is no parent.
- From: Li Yuan <liyuan src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+] Return state_set directly if there is no parent.
- Date: Fri, 21 Aug 2009 07:32:37 +0000 (UTC)
commit 0780a4975b71f563f6846f29c763d1d5c93f3a91
Author: Li Yuan <li yuan sun com>
Date: Fri Aug 21 15:29:51 2009 +0800
Return state_set directly if there is no parent.
Bug #592403. Return state_set directly if there is no parent. Fix crash.
modules/other/gail/gailmenuitem.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/modules/other/gail/gailmenuitem.c b/modules/other/gail/gailmenuitem.c
index 3c238e7..24b1a85 100644
--- a/modules/other/gail/gailmenuitem.c
+++ b/modules/other/gail/gailmenuitem.c
@@ -251,16 +251,18 @@ gail_menu_item_ref_state_set (AtkObject *obj)
menu_item = atk_object_get_parent (obj);
- if (!GTK_IS_MENU_ITEM (GTK_ACCESSIBLE (menu_item)->widget))
- return state_set;
-
- parent_state_set = atk_object_ref_state_set (menu_item);
- if (!atk_state_set_contains_state (parent_state_set, ATK_STATE_SELECTED))
+ if (menu_item)
{
- atk_state_set_remove_state (state_set, ATK_STATE_FOCUSED);
- atk_state_set_remove_state (state_set, ATK_STATE_SHOWING);
- }
+ if (!GTK_IS_MENU_ITEM (GTK_ACCESSIBLE (menu_item)->widget))
+ return state_set;
+ parent_state_set = atk_object_ref_state_set (menu_item);
+ if (!atk_state_set_contains_state (parent_state_set, ATK_STATE_SELECTED))
+ {
+ atk_state_set_remove_state (state_set, ATK_STATE_FOCUSED);
+ atk_state_set_remove_state (state_set, ATK_STATE_SHOWING);
+ }
+ }
return state_set;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]