#include <config.h>
#include <string.h>
#include <glib.h>
+#include <gio/gio.h>
#include <stdio.h>
#include <dlfcn.h>
#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
#include "paths.h"
#include "registry.h"
#include "deviceeventcontroller.h"
-#include "libregistry-internals.h"
-
-#define CORBA_GCONF_KEY "/desktop/gnome/interface/at-spi-corba"
-
-static gboolean need_to_quit ();
+#include "atspi/atspi.h"
static GMainLoop *mainloop;
static gchar *dbus_name = NULL;
{NULL}
};
-static DBusGConnection *bus_connection = NULL;
-static DBusGProxy *sm_proxy = NULL;
+static GDBusConnection *bus_connection = NULL;
+static GDBusProxy *sm_proxy = NULL;
static char *client_id = NULL;
-static DBusGProxy *client_proxy = NULL;
+static GDBusProxy *client_proxy = NULL;
#define SM_DBUS_NAME "org.gnome.SessionManager"
#define SM_DBUS_PATH "/org/gnome/SessionManager"
static void registry_session_init (const char *previous_client_id, const char *exe);
+static void
+on_session_over (GDBusProxy *proxy,
+ gchar *sender_name,
+ gchar *signal_name,
+ GVariant *parameters,
+ gpointer user_data)
+{
+ if (g_strcmp0 (signal_name, "SessionOver") == 0) {
+ g_main_loop_quit (mainloop);
+ }
+}
+
static gboolean
session_manager_connect (void)
{
- if (bus_connection == NULL) {
- GError *error;
-
- error = NULL;
- bus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
- if (bus_connection == NULL) {
- g_message ("Failed to connect to the session bus: %s",
- error->message);
- g_error_free (error);
- exit (1);
- }
- }
-
- sm_proxy = dbus_g_proxy_new_for_name (bus_connection,
+ sm_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL,
SM_DBUS_NAME,
SM_DBUS_PATH,
- SM_DBUS_INTERFACE);
+ SM_DBUS_INTERFACE, NULL, NULL);
+
+ g_signal_connect (G_OBJECT (sm_proxy), "g-signal",
+ G_CALLBACK (on_session_over), NULL);
+
return (sm_proxy != NULL);
}
static gboolean
end_session_response (gboolean is_okay, const gchar *reason)
{
- gboolean ret;
+ GVariant *ret;
GError *error = NULL;
- ret = dbus_g_proxy_call (client_proxy, "EndSessionResponse",
- &error,
- G_TYPE_BOOLEAN, is_okay,
- G_TYPE_STRING, reason,
- G_TYPE_INVALID,
- G_TYPE_INVALID);
+ if (!reason)
+ reason = "";
+
+ ret = g_dbus_proxy_call_sync (client_proxy, "EndSessionResponse",
+ g_variant_new ("(bs)", is_okay, reason),
+ 0, 1000, NULL, &error);
if (!ret) {
g_warning ("Failed to send session response %s", error->message);
g_error_free (error);
+ return FALSE;
}
+ else
+ g_variant_unref (ret);
- return ret;
+ return TRUE;
}
static void
-query_end_session_cb (guint flags, gpointer data)
+client_proxy_signal_cb (GDBusProxy *proxy,
+ gchar *sender_name,
+ gchar *signal_name,
+ GVariant *parameters,
+ gpointer user_data)
{
- end_session_response (TRUE, NULL);
+ if (g_strcmp0 (signal_name, "QueryEndSession") == 0) {
+ g_debug ("Got QueryEndSession signal");
+ end_session_response (TRUE, NULL);
+ } else if (g_strcmp0 (signal_name, "EndSession") == 0) {
+ g_debug ("Got EndSession signal");
+ end_session_response (TRUE, NULL);
+ g_main_loop_quit (mainloop);
+ } else if (g_strcmp0 (signal_name, "Stop") == 0) {
+ g_debug ("Got Stop signal");
+ g_main_loop_quit (mainloop);
+ }
}
-static void
-end_session_cb (guint flags, gpointer data)
-{
- end_session_response (TRUE, NULL);
- g_main_loop_quit (mainloop);
-}
static gboolean
register_client (void)
{
GError *error;
- gboolean res;
+ GVariant *res;
const char *startup_id;
const char *app_id;
startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
+ if (!startup_id)
+ startup_id = "";
app_id = "at-spi-registryd.desktop";
error = NULL;
- res = dbus_g_proxy_call (sm_proxy,
+ res = g_dbus_proxy_call_sync (sm_proxy,
"RegisterClient",
- &error,
- G_TYPE_STRING, app_id,
- G_TYPE_STRING, startup_id,
- G_TYPE_INVALID,
- DBUS_TYPE_G_OBJECT_PATH, &client_id,
- G_TYPE_INVALID);
+ g_variant_new ("(ss)", app_id,
+ startup_id),
+ 0, 1000, NULL, &error);
if (! res) {
g_warning ("Failed to register client: %s", error->message);
g_error_free (error);
return FALSE;
}
+ g_variant_get (res, "(o)", &client_id);
+ g_variant_unref (res);
- client_proxy = dbus_g_proxy_new_for_name (bus_connection,
+ client_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL,
SM_DBUS_NAME,
client_id,
- SM_CLIENT_DBUS_INTERFACE);
-
- dbus_g_proxy_add_signal (client_proxy, "Stop", G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (client_proxy, "Stop",
- G_CALLBACK (stop_cb), NULL, NULL);
-
- dbus_g_proxy_add_signal (client_proxy, "QueryEndSession", G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (client_proxy, "QueryEndSession",
- G_CALLBACK (query_end_session_cb), NULL, NULL);
+ SM_CLIENT_DBUS_INTERFACE,
+ NULL, NULL);
- dbus_g_proxy_add_signal (client_proxy, "EndSession", G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (client_proxy, "EndSession",
- G_CALLBACK (end_session_cb), NULL, NULL);
+ g_signal_connect (client_proxy, "g-signal",
+ G_CALLBACK (client_proxy_signal_cb), NULL);
g_unsetenv ("DESKTOP_AUTOSTART_ID");
DBusError error;
int ret;
- if (need_to_quit ())
- return 0;
-
g_type_init();
/*Parse command options*/
dbus_name = SPI_DBUS_NAME_REGISTRY;
dbus_error_init (&error);
- bus = _libregistry_get_a11y_bus ();
+ bus = atspi_get_a11y_bus ();
if (!bus)
{
return 0;
}
mainloop = g_main_loop_new (NULL, FALSE);
- dbus_connection_setup_with_g_main(bus, NULL);
+ atspi_dbus_connection_setup_with_g_main(bus, NULL);
ret = dbus_bus_request_name(bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS)
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;
-}
projects / platform / upstream / at-spi2-core.git / blobdiff