summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2012-06-13 19:22:48 +0100
committerBastien Nocera <hadess@hadess.net>2012-06-14 18:13:51 +0100
commitc80d57315ed612873d8ceb7d37482a1e5c12f216 (patch)
treec805cbdb9465014594936609de46974b0c5e73ef
parenta92b668cec8f9c185050ba7d525ba3aa1cedd084 (diff)
downloadat-spi2-atk-c80d57315ed612873d8ceb7d37482a1e5c12f216.tar.gz
Namespace the exported API
https://bugzilla.gnome.org/show_bug.cgi?id=678051
-rw-r--r--atk-adaptor/atk-bridge.h4
-rw-r--r--atk-adaptor/atkbridge.symbols4
-rw-r--r--atk-adaptor/bridge.c4
-rw-r--r--atk-adaptor/gtk-2.0/module.c6
-rw-r--r--atk-adaptor/gtk-3.0/module.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/atk-adaptor/atk-bridge.h b/atk-adaptor/atk-bridge.h
index ae0fcc5..e17d8aa 100644
--- a/atk-adaptor/atk-bridge.h
+++ b/atk-adaptor/atk-bridge.h
@@ -27,8 +27,8 @@
G_BEGIN_DECLS
-int adaptor_init (int * argc, char ** argv[]);
-void adaptor_cleanup (void);
+int atk_bridge_adaptor_init (int * argc, char ** argv[]);
+void atk_bridge_adaptor_cleanup (void);
G_END_DECLS
diff --git a/atk-adaptor/atkbridge.symbols b/atk-adaptor/atkbridge.symbols
index bf71c16..d90cf94 100644
--- a/atk-adaptor/atkbridge.symbols
+++ b/atk-adaptor/atkbridge.symbols
@@ -1,2 +1,2 @@
-adaptor_init
-adaptor_cleanup
+atk_bridge_adaptor_init
+atk_bridge_adaptor_cleanup
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 1ee9ba9..ff5c320 100644
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -710,7 +710,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
*
*/
int
-adaptor_init (gint * argc, gchar ** argv[])
+atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
{
GOptionContext *opt;
GError *err = NULL;
@@ -851,7 +851,7 @@ adaptor_init (gint * argc, gchar ** argv[])
}
void
-adaptor_cleanup (void)
+atk_bridge_adaptor_cleanup (void)
{
GList *l;
GSList *ls;
diff --git a/atk-adaptor/gtk-2.0/module.c b/atk-adaptor/gtk-2.0/module.c
index a7251d2..93a1905 100644
--- a/atk-adaptor/gtk-2.0/module.c
+++ b/atk-adaptor/gtk-2.0/module.c
@@ -37,7 +37,7 @@ gtk_module_init (gint * argc, gchar ** argv[])
if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
{
- return adaptor_init (argc, argv);
+ return atk_bridge_adaptor_init (argc, argv);
}
return 0;
}
@@ -57,7 +57,7 @@ gnome_accessibility_module_init (void)
if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
{
- adaptor_init (NULL, NULL);
+ atk_bridge_adaptor_init (NULL, NULL);
if (g_getenv ("AT_SPI_DEBUG"))
{
@@ -69,5 +69,5 @@ gnome_accessibility_module_init (void)
void
gnome_accessibility_module_shutdown (void)
{
- adaptor_cleanup ();
+ atk_bridge_adaptor_cleanup ();
}
diff --git a/atk-adaptor/gtk-3.0/module.c b/atk-adaptor/gtk-3.0/module.c
index 0483cca..5f724eb 100644
--- a/atk-adaptor/gtk-3.0/module.c
+++ b/atk-adaptor/gtk-3.0/module.c
@@ -37,7 +37,7 @@ gtk_module_init (gint * argc, gchar ** argv[])
if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
{
- return adaptor_init (argc, argv);
+ return atk_bridge_adaptor_init (argc, argv);
}
return 0;
}