[at-spi2-atk] Have adaptor_init() return -1 on error and not consider itself initialized
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-atk] Have adaptor_init() return -1 on error and not consider itself initialized
- Date: Fri, 6 Aug 2010 00:51:01 +0000 (UTC)
commit 6ab19f79abaf63b15d5090eaa42f417527e53562
Author: Mike Gorse <mgorse novell com>
Date: Thu Aug 5 20:51:30 2010 -0400
Have adaptor_init() return -1 on error and not consider itself initialized
atk-adaptor/bridge.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 571d8e1..9cd9ba9 100644
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -489,7 +489,12 @@ adaptor_init (gint * argc, gchar ** argv[])
DRoutePath *treepath, *accpath;
root = atk_get_root ();
- g_return_val_if_fail (root, 0);
+ g_warn_if_fail (root);
+ if (!root)
+ {
+ inited = FALSE;
+ return -1;
+ }
/* Parse command line options */
opt = g_option_context_new (NULL);
@@ -510,7 +515,8 @@ adaptor_init (gint * argc, gchar ** argv[])
{
g_free (spi_global_app_data);
spi_global_app_data = NULL;
- return 0;
+ inited = FALSE;
+ return -1;
}
if (atspi_dbus_name != NULL)
@@ -553,7 +559,7 @@ adaptor_init (gint * argc, gchar ** argv[])
if (!treepath)
{
g_warning ("atk-bridge: Error in droute_add_one(). Already running?");
- return 0;
+ return -1;
}
accpath = droute_add_many (spi_global_app_data->droute,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]