[at-spi2-core] Revert "at-spi-bus-launcher: register with session manager"



commit 4153dfa84b5611d2a5f24bb05d2327db02498ce5
Author: Mike Gorse <mgorse suse com>
Date:   Tue Jan 26 11:20:51 2016 -0600

    Revert "at-spi-bus-launcher: register with session manager"
    
    Committed the wrong patch.
    
    This reverts commit d2004dbb0d0903548f734029718ee5bf212d107c.

 bus/at-spi-bus-launcher.c |   73 +--------------------------------------------
 1 files changed, 1 insertions(+), 72 deletions(-)
---
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index 6df220e..b6bd8e8 100644
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -76,76 +76,6 @@ static const gchar introspection_xml[] =
 static GDBusNodeInfo *introspection_data = NULL;
 
 static void
-register_client (A11yBusLauncher *app)
-{
-  GDBusProxyFlags flags;
-  GDBusProxy *sm_proxy;
-  GError *error;
-  const gchar *app_id;
-  const gchar *autostart_id;
-  gchar *client_startup_id;
-  GVariant *parameters;
-  GVariant *variant;
-  gchar *object_path;
-
-  flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
-          G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS;
-
-  error = NULL;
-  sm_proxy = g_dbus_proxy_new_sync (app->session_bus, flags, NULL,
-                                    "org.gnome.SessionManager",
-                                    "/org/gnome/SessionManager",
-                                    "org.gnome.SessionManager",
-                                    NULL, &error);
-
-  if (error != NULL)
-    {
-      g_warning ("Failed to get session manager proxy: %s", error->message);
-      g_error_free (error);
-
-      return;
-    }
-
-  app_id = "at-spi-bus-launcher";
-  autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
-
-  if (autostart_id != NULL)
-    {
-      client_startup_id = g_strdup (autostart_id);
-      g_unsetenv ("DESKTOP_AUTOSTART_ID");
-    }
-  else
-    {
-      client_startup_id = g_strdup ("");
-    }
-
-  parameters = g_variant_new ("(ss)", app_id, client_startup_id);
-  g_free (client_startup_id);
-
-  error = NULL;
-  variant = g_dbus_proxy_call_sync (sm_proxy,
-                                    "RegisterClient", parameters,
-                                    G_DBUS_CALL_FLAGS_NONE,
-                                    -1, NULL, &error);
-
-  g_object_unref (sm_proxy);
-
-  if (error != NULL)
-    {
-      g_warning ("Failed to register client: %s", error->message);
-      g_error_free (error);
-
-      return;
-    }
-
-  g_variant_get (variant, "(o)", &object_path);
-  g_variant_unref (variant);
-
-  g_debug ("Client registered - %s", object_path);
-  g_free (object_path);
-}
-
-static void
 setup_bus_child (gpointer data)
 {
   A11yBusLauncher *app = data;
@@ -524,8 +454,7 @@ on_name_acquired (GDBusConnection *connection,
                   gpointer         user_data)
 {
   A11yBusLauncher *app = user_data;
-
-  register_client (app);
+  (void) app;
 }
 
 static int sigterm_pipefd[2];


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]