diff options
| author | William Jon McCann <jmccann@redhat.com> | 2010-10-07 02:48:20 -0400 |
|---|---|---|
| committer | William Jon McCann <jmccann@redhat.com> | 2010-10-07 02:52:35 -0400 |
| commit | cadbdd32ba9c610b28fb45dd5d6fd8f2a4c040f2 (patch) | |
| tree | 27db6e490660920880f7250fb9ac56ac3d96246d /modules | |
| parent | bbf189ca0d48bf448301b7c8a1407f2f59bdb539 (diff) | |
| download | gtk+-cadbdd32ba9c610b28fb45dd5d6fd8f2a4c040f2.tar.gz | |
gail: don't try to get stock id from images that aren't stock
Fixes assertion caused by 41d2a4d059d881d8d05419013ae4946a81b308cb
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/other/gail/gailimage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/other/gail/gailimage.c b/modules/other/gail/gailimage.c index 38d0c587c7..da8698551d 100644 --- a/modules/other/gail/gailimage.c +++ b/modules/other/gail/gailimage.c @@ -146,9 +146,11 @@ gail_image_get_name (AtkObject *accessible) g_free (image_accessible->stock_name); image_accessible->stock_name = NULL; + if (gtk_image_get_storage_type (image) != GTK_IMAGE_STOCK) + return NULL; + gtk_image_get_stock (image, &stock_id, NULL); - if (gtk_image_get_storage_type (image) != GTK_IMAGE_STOCK || - stock_id == NULL) + if (stock_id == NULL) return NULL; if (!gtk_stock_lookup (stock_id, &stock_item)) |