Namespace the exported API

https://bugzilla.gnome.org/show_bug.cgi?id=678051

diff --git a/atk-adaptor/atk-bridge.h b/atk-adaptor/atk-bridge.h
index ae0fcc5..e17d8aa 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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;
 }