Make dbus-gmain.h internal, and rename its symbols

If we embed dbus-gmain in dbus-glib, dbus-python, at-spi2-core and
others as a submodule or subtree, we won't want it to export the
same ABI in all of them.

Signed-off-by: Simon McVittie <smcv@debian.org>

3 files changed, 8 insertions, 8 deletions

diff --git a/test/core/30574.c b/test/core/30574.c
index 2cf1e21..a5aa5cc 100644
--- a/test/core/30574.c
+++ b/test/core/30574.c
@@ -22,7 +22,7 @@ set_reply (DBusPendingCall * pending, void *user_data)
   SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data;
 
   closure->reply = dbus_pending_call_steal_reply (pending);
-  dbus_connection_setup_with_g_main (bus, NULL);
+  dbus_gmain_set_up_connection (bus, NULL);
 
   g_main_loop_quit (closure->loop);
 }
@@ -35,17 +35,17 @@ send_and_allow_reentry (DBusConnection * bus, DBusMessage * message,
   SpiReentrantCallClosure closure;
 
   closure.loop = g_main_loop_new (main_context, FALSE);
-  dbus_connection_setup_with_g_main (bus, (switch_after_send ? NULL :
+  dbus_gmain_set_up_connection (bus, (switch_after_send ? NULL :
                                                                main_context));
 
   if (!dbus_connection_send_with_reply (bus, message, &pending, 3000))
     {
-  dbus_connection_setup_with_g_main (bus, NULL);
+  dbus_gmain_set_up_connection (bus, NULL);
       return NULL;
     }
   dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
   if (switch_after_send)
-    dbus_connection_setup_with_g_main (bus, main_context);
+    dbus_gmain_set_up_connection (bus, main_context);
   g_main_loop_run  (closure.loop);
 
   g_main_loop_unref (closure.loop);
@@ -99,7 +99,7 @@ main(int argc, const char *argv[])
     fprintf(stderr, "Couldn't connect to bus: %s\n", error.name);
     return 1;
   }
-  dbus_connection_setup_with_g_main (bus, NULL);
+  dbus_gmain_set_up_connection (bus, NULL);
   send_test_message (FALSE);
   send_test_message (FALSE);
   send_test_message (TRUE);
diff --git a/test/core/test-thread-client.c b/test/core/test-thread-client.c
index e246a33..ecd6c0e 100644
--- a/test/core/test-thread-client.c
+++ b/test/core/test-thread-client.c
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
       return 1;
     }
 
-  dbus_connection_setup_with_g_main (connection, NULL);
+  dbus_gmain_set_up_connection (connection, NULL);
 
   for (i = 0; i < N_TEST_THREADS; i++)
     {
diff --git a/test/core/test-thread-server.c b/test/core/test-thread-server.c
index 33fb08c..34cbb1e 100644
--- a/test/core/test-thread-server.c
+++ b/test/core/test-thread-server.c
@@ -154,7 +154,7 @@ new_connection_callback (DBusServer     *server,
   g_print ("new_connection_callback\n");
   
   dbus_connection_ref (new_connection);
-  dbus_connection_setup_with_g_main (new_connection, NULL);
+  dbus_gmain_set_up_connection (new_connection, NULL);
 
   data = thread_test_data_new ();
   
@@ -200,7 +200,7 @@ main (int argc, char *argv[])
                                            new_connection_callback,
                                            NULL, NULL);
 
-  dbus_server_setup_with_g_main (server, NULL);
+  dbus_gmain_set_up_server (server, NULL);
   
   loop = g_main_loop_new (NULL, FALSE);
   g_main_loop_run (loop);