projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
83b4bb9
)
Reset inited variable on cleanup
author
Bastien Nocera
<hadess@hadess.net>
Fri, 15 Jun 2012 15:58:54 +0000
(16:58 +0100)
committer
Bastien Nocera
<hadess@hadess.net>
Fri, 15 Jun 2012 16:06:42 +0000
(17:06 +0100)
atk-adaptor/bridge.c
patch
|
blob
|
history
diff --git
a/atk-adaptor/bridge.c
b/atk-adaptor/bridge.c
index
d776a4b
..
666b34c
100644
(file)
--- a/
atk-adaptor/bridge.c
+++ b/
atk-adaptor/bridge.c
@@
-56,6
+56,8
@@
signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data);
SpiBridge *spi_global_app_data = NULL;
SpiBridge *spi_global_app_data = NULL;
+static gboolean inited = FALSE;
+
/*---------------------------------------------------------------------------*/
static void
/*---------------------------------------------------------------------------*/
static void
@@
-737,7
+739,6
@@
atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
GError *err = NULL;
DBusError error;
AtkObject *root;
GError *err = NULL;
DBusError error;
AtkObject *root;
- static gboolean inited = FALSE;
gboolean load_bridge;
load_bridge = check_envvar ();
gboolean load_bridge;
load_bridge = check_envvar ();
@@
-882,6
+883,8
@@
atk_bridge_adaptor_cleanup (void)
GList *l;
GSList *ls;
GList *l;
GSList *ls;
+ g_return_if_fail (inited);
+
if (!spi_global_app_data)
return;
if (!spi_global_app_data)
return;
@@
-925,6
+928,8
@@
atk_bridge_adaptor_cleanup (void)
g_free (spi_global_app_data);
spi_global_app_data = NULL;
g_free (spi_global_app_data);
spi_global_app_data = NULL;
+
+ inited = FALSE;
}
/*---------------------------------------------------------------------------*/
}
/*---------------------------------------------------------------------------*/