summaryrefslogtreecommitdiff
path: root/atk-adaptor/bridge.h
diff options
context:
space:
mode:
authorMike Gorse <mgorse@novell.com>2010-10-07 16:41:38 +0200
committerMike Gorse <mgorse@novell.com>2010-10-07 16:41:38 +0200
commit0e86eaf1b77ba2e557c6b17201fbeefda5e92ad2 (patch)
tree85b82480d874b372dbb4e0121897374f1a6e9519 /atk-adaptor/bridge.h
parent1bd04d0eba893ad35019f151da08df85e13e7297 (diff)
parent747254496ecabd11e84615295ef629959f8ad9d6 (diff)
downloadat-spi2-atk-0e86eaf1b77ba2e557c6b17201fbeefda5e92ad2.tar.gz
Merge branch 'master' into p2p
Conflicts: configure.ac
Diffstat (limited to 'atk-adaptor/bridge.h')
-rw-r--r--atk-adaptor/bridge.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/atk-adaptor/bridge.h b/atk-adaptor/bridge.h
index 728b245..1a3ebee 100644
--- a/atk-adaptor/bridge.h
+++ b/atk-adaptor/bridge.h
@@ -61,6 +61,7 @@ struct _SpiBridge
gchar *desktop_path;
char *app_bus_addr;
GList *events;
+ gboolean events_initialized;
};
extern SpiBridge *spi_global_app_data;