diff options
Diffstat (limited to 'daemon/xdmcp-chooser-slave-main.c')
| -rw-r--r-- | daemon/xdmcp-chooser-slave-main.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/daemon/xdmcp-chooser-slave-main.c b/daemon/xdmcp-chooser-slave-main.c index ea542109..135e38c8 100644 --- a/daemon/xdmcp-chooser-slave-main.c +++ b/daemon/xdmcp-chooser-slave-main.c @@ -34,10 +34,7 @@ #include <glib.h> #include <glib/gi18n.h> #include <glib-object.h> - -#define DBUS_API_SUBJECT_TO_CHANGE -#include <dbus/dbus-glib.h> -#include <dbus/dbus-glib-lowlevel.h> +#include <gio/gio.h> #include "gdm-xerrors.h" #include "gdm-signal-handler.h" @@ -52,15 +49,14 @@ static GdmSettings *settings = NULL; static int gdm_return_code = 0; -static DBusGConnection * +static GDBusConnection * get_system_bus (void) { GError *error; - DBusGConnection *bus; - DBusConnection *connection; + GDBusConnection *bus; error = NULL; - bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); + bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); if (bus == NULL) { g_warning ("Couldn't connect to system bus: %s", error->message); @@ -68,8 +64,7 @@ get_system_bus (void) goto out; } - connection = dbus_g_connection_get_connection (bus); - dbus_connection_set_exit_on_disconnect (connection, FALSE); + g_dbus_connection_set_exit_on_close (bus, FALSE); out: return bus; @@ -176,7 +171,7 @@ main (int argc, { GMainLoop *main_loop; GOptionContext *context; - DBusGConnection *connection; + GDBusConnection *connection; GdmSlave *slave; static char *display_id = NULL; GdmSignalHandler *signal_handler; @@ -263,8 +258,9 @@ main (int argc, g_main_loop_unref (main_loop); out: - g_debug ("Slave finished"); + g_object_unref (connection); + return gdm_return_code; } |