[at-spi2-core] Remove support for relocated CORBA, as discussed at the a11y meeting

[Mike Gorse <mgorse src gnome org>]

commit af75f08f34e3eae22cc7aeb78cfd074fb42b242e
Author: Mike Gorse <mgorse novell com>
Date:   Thu Jul 28 14:36:18 2011 -0500

    Remove support for relocated CORBA, as discussed at the a11y meeting

 bus/at-spi-bus-launcher.c |   23 -----------------------
 registryd/registry-main.c |   43 -------------------------------------------
 2 files changed, 0 insertions(+), 66 deletions(-)
---
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index dcc35e4..53c8527 100644
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -331,26 +331,6 @@ init_sigterm_handling (A11yBusLauncher *app)
 }
 
 static gboolean
-is_a11y_using_corba (void)
-{
-  char *gconf_argv[] = { "gconftool-2", "--get", "/desktop/gnome/interface/at-spi-corba", NULL };
-  char *stdout = NULL;
-  int estatus;
-  gboolean result = FALSE;
-
-  if (!g_spawn_sync (NULL, gconf_argv, NULL,
-                     G_SPAWN_SEARCH_PATH, NULL, NULL, &stdout, NULL, &estatus, NULL))
-    goto out;
-  if (estatus != 0)
-    goto out;
-  if (g_str_has_prefix (stdout, "true"))
-    result = TRUE;
- out:
-  g_free (stdout);
-  return result;
-}
-
-static gboolean
 already_running ()
 {
   Atom AT_SPI_BUS;
@@ -404,9 +384,6 @@ main (int    argc,
 
   g_type_init ();
 
-  if (is_a11y_using_corba ())
-    return 0;
-
   if (already_running ())
     return 0;
 
diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index 9dded9b..abc8e4e 100644
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -36,10 +36,6 @@
 #include "deviceeventcontroller.h"
 #include "atspi/atspi.h"
 
-#define CORBA_GCONF_KEY  "/desktop/gnome/interface/at-spi-corba"
-
-static gboolean need_to_quit ();
-
 static GMainLoop *mainloop;
 static gchar *dbus_name = NULL;
 static gboolean use_gnome_session = FALSE;
@@ -204,9 +200,6 @@ main (int argc, char **argv)
   DBusError error;
   int ret;
 
-  if (need_to_quit ())
-    return 0;
-
   g_type_init();
 
   /*Parse command options*/
@@ -254,39 +247,3 @@ main (int argc, char **argv)
   g_main_loop_run (mainloop);
   return 0;
 }
-
-static gboolean
-need_to_quit ()
-{
-  void *gconf = NULL;
-  gconf_client_get_default_t gconf_client_get_default = NULL;
-  gconf_client_get_bool_t gconf_client_get_bool = NULL;
-  GObject *gconf_client;	/* really a GConfClient */
-  gboolean ret;
-
-  g_type_init ();
-
-  gconf = dlopen ("libgconf-2.so", RTLD_LAZY);
-  if (gconf)
-    {
-      gconf_client_get_default = dlsym (gconf, "gconf_client_get_default");
-      gconf_client_get_bool = dlsym (gconf, "gconf_client_get_bool");
-  }
-
-  if (!gconf_client_get_default || !gconf_client_get_bool)
-    {
-      if (gconf)
-        dlclose (gconf);
-      return FALSE;
-    }
-
-  /* If we've been relocated, we will exit if the at-spi-corba gconf key
- * has been set.  If we have not been relocated, we will only run if the
- * at-spi-dbus gconf key has been set.
-   */
-  gconf_client = gconf_client_get_default ();
-  ret = gconf_client_get_bool (gconf_client, CORBA_GCONF_KEY, NULL);
-  g_object_unref (gconf_client);
-
-  return ret;
-}