diff options
| author | Mark Doffman <mdoff@silver-wind.(none)> | 2009-02-19 15:27:33 +0000 |
|---|---|---|
| committer | Mark Doffman <mdoff@silver-wind.(none)> | 2009-02-19 15:27:33 +0000 |
| commit | 0b5f4db64d874cfef13ca62bc0c5413358af0d4e (patch) | |
| tree | 64f36a1b52d7a1080659feb3c36254c3ace4fc86 /atk-adaptor/accessible-register.c | |
| parent | e3d60f6c05f1425da98eada5363737a540dc01e7 (diff) | |
| download | at-spi2-atk-0b5f4db64d874cfef13ca62bc0c5413358af0d4e.tar.gz | |
2009-02-19 Mark Doffman <mark.doffman@codethink.co.uk>
Remove all g_asserts and they could be rude and
abort your program. Replace them with g_return_val_if_fail
where appropriate. Add a warning when the root
accessible is NULL.
Diffstat (limited to 'atk-adaptor/accessible-register.c')
| -rw-r--r-- | atk-adaptor/accessible-register.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c index 81dac6b..3595f3e 100644 --- a/atk-adaptor/accessible-register.c +++ b/atk-adaptor/accessible-register.c @@ -153,7 +153,7 @@ static void deregister_accessible (gpointer data, GObject *accessible) { guint ref; - g_assert (ATK_IS_OBJECT (accessible)); + g_return_if_fail (ATK_IS_OBJECT (accessible)); ref = object_to_ref (ATK_OBJECT(accessible)); if (ref != 0) @@ -169,7 +169,7 @@ static void register_accessible (AtkObject *accessible) { guint ref; - g_assert(ATK_IS_OBJECT(accessible)); + g_return_if_fail (ATK_IS_OBJECT(accessible)); ref = assign_reference(); @@ -313,7 +313,7 @@ static void update_accessible (AtkObject *accessible) { guint ref = 0; - g_assert(ATK_IS_OBJECT(accessible)); + g_return_if_fail (ATK_IS_OBJECT(accessible)); ref = object_to_ref (accessible); if (ref) @@ -339,7 +339,7 @@ atk_dbus_path_to_object (const char *path) guint index; void *data; - g_assert (path); + g_return_val_if_fail (path, NULL); if (strncmp(path, SPI_ATK_OBJECT_PATH_PREFIX, SPI_ATK_PATH_PREFIX_LENGTH) != 0) return NULL; @@ -408,7 +408,7 @@ tree_update_listener (GSignalInvocationHint *signal_hint, * have their signals processed. */ accessible = g_value_get_object (¶m_values[0]); - g_assert (ATK_IS_OBJECT (accessible)); + g_return_val_if_fail (ATK_IS_OBJECT (accessible), TRUE); if (object_to_ref (accessible)) { @@ -459,7 +459,7 @@ tree_update_children_listener (GSignalInvocationHint *signal_hint, * have their signals processed. */ accessible = g_value_get_object (¶m_values[0]); - g_assert (ATK_IS_OBJECT (accessible)); + g_return_val_if_fail (ATK_IS_OBJECT (accessible), TRUE); if (object_to_ref (accessible)) { |