diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-02-13 16:18:20 -0500 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-02-13 17:01:23 -0500 |
| commit | dcec22b0ad9f1c50d10d4bbbfa69bbfad6232357 (patch) | |
| tree | 31b4e9b056f128a2922757f3bf63b1706495748f /daemon | |
| parent | d94f5a79acf308e2d1adb25790e8379f8a839ba3 (diff) | |
| download | gdm-dcec22b0ad9f1c50d10d4bbbfa69bbfad6232357.tar.gz | |
common: Remove settings client / server
This is used in *one* place in the simple slave. Just port it
over to use gdm_settings_direct instead of keeping an entire
DBus API around for just one call...
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/gdm-simple-slave.c | 4 | ||||
| -rw-r--r-- | daemon/simple-slave-main.c | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index d83216be..a58368d8 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -44,7 +44,6 @@ #include "gdm-common.h" -#include "gdm-settings-client.h" #include "gdm-settings-keys.h" #include "gdm-simple-slave.h" @@ -1491,8 +1490,7 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) slave->priv->server = gdm_server_new (display_name, seat_id, auth_file, display_is_initial); disable_tcp = TRUE; - if (gdm_settings_client_get_boolean (GDM_KEY_DISALLOW_TCP, - &disable_tcp)) { + if (gdm_settings_direct_get_boolean (GDM_KEY_DISALLOW_TCP, &disable_tcp)) { g_object_set (slave->priv->server, "disable-tcp", disable_tcp, NULL); diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c index 5c6bfa20..a94a5ad0 100644 --- a/daemon/simple-slave-main.c +++ b/daemon/simple-slave-main.c @@ -43,7 +43,6 @@ #include "gdm-settings.h" #include "gdm-settings-direct.h" #include "gdm-settings-keys.h" -#include "gdm-settings-client.h" static GdmSettings *settings = NULL; static int gdm_return_code = 0; @@ -159,11 +158,6 @@ main (int argc, exit (1); } - if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) { - g_critical ("Unable to initialize settings client"); - exit (1); - } - main_loop = g_main_loop_new (NULL, FALSE); g_unix_signal_add (SIGTERM, on_shutdown_signal_cb, main_loop); |