diff options
| author | Padraig O'Briain <padraig.obriain@sun.com> | 2003-10-08 15:20:10 +0000 |
|---|---|---|
| committer | Padraig O'Briain <padraigo@src.gnome.org> | 2003-10-08 15:20:10 +0000 |
| commit | bce496677377c9e5c9624d82f454046d5e1a20d2 (patch) | |
| tree | 85c9291023c771e2cb7610950cc6069d597c14f5 /libnautilus-private | |
| parent | db8964065e5e3eb1651968ac5c99d1751b0e4362 (diff) | |
| download | nautilus-bce496677377c9e5c9624d82f454046d5e1a20d2.tar.gz | |
libnautilus-private/nautilus-icon-canvas-item.c
2003-10-08 Padraig O'Briain <padraig.obriain@sun.com>
* libnautilus-private/nautilus-icon-canvas-item.c
(nautilus_icon_canvas_item_accessible_ref_state_set) Avoid
dereferencing a NULL pointer. (bug #124122)
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-icon-canvas-item.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 2227051bf..4dd2fdebf 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -2093,10 +2093,12 @@ nautilus_icon_canvas_item_accessible_ref_state_set (AtkObject *accessible) state_set = ATK_OBJECT_CLASS (accessible_parent_class)->ref_state_set (accessible); item = eel_accessibility_get_gobject (accessible); - container = NAUTILUS_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas); if (!item) { atk_state_set_add_state (state_set, ATK_STATE_DEFUNCT); - } else if (item->details->is_highlighted_as_keyboard_focus) { + return state_set; + } + container = NAUTILUS_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas); + if (item->details->is_highlighted_as_keyboard_focus) { atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); } else if (!container->details->keyboard_focus) { |