diff options
| author | Ray Strode <rstrode@redhat.com> | 2011-06-15 10:48:27 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2011-06-15 11:29:45 -0400 |
| commit | c271f7000afbb9998996ede6956f23d514590f5b (patch) | |
| tree | 6fce46dc70739fd236a07cea177ac4917e7f3a1e /daemon/gdm-xdmcp-display-factory.c | |
| parent | d7c3fd80d26da858d6abce7b59e000fb9cff7729 (diff) | |
| download | gdm-c271f7000afbb9998996ede6956f23d514590f5b.tar.gz | |
daemon: drop some fluff code
There's a bit of needless boilerplate and dead code
just sort of sitting around in various places.
This commit cleans things up a bit.
Diffstat (limited to 'daemon/gdm-xdmcp-display-factory.c')
| -rw-r--r-- | daemon/gdm-xdmcp-display-factory.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c index f62fdfbb..d5ac32b5 100644 --- a/daemon/gdm-xdmcp-display-factory.c +++ b/daemon/gdm-xdmcp-display-factory.c @@ -2991,26 +2991,30 @@ gdm_xdmcp_display_factory_start (GdmDisplayFactory *base_factory) g_return_val_if_fail (factory->priv->socket_fd == -1, FALSE); /* read configuration */ - res = gdm_settings_direct_get_uint (GDM_KEY_UDP_PORT, - &(factory->priv->port)); - res = gdm_settings_direct_get_boolean (GDM_KEY_MULTICAST, - &(factory->priv->use_multicast)); - res = gdm_settings_direct_get_string (GDM_KEY_MULTICAST_ADDR, - &(factory->priv->multicast_address)); - res = gdm_settings_direct_get_boolean (GDM_KEY_INDIRECT, - &(factory->priv->honor_indirect)); - res = gdm_settings_direct_get_uint (GDM_KEY_DISPLAYS_PER_HOST, - &(factory->priv->max_displays_per_host)); - res = gdm_settings_direct_get_uint (GDM_KEY_MAX_SESSIONS, - &(factory->priv->max_displays)); - res = gdm_settings_direct_get_uint (GDM_KEY_MAX_PENDING, - &(factory->priv->max_pending_displays)); - res = gdm_settings_direct_get_uint (GDM_KEY_MAX_WAIT, - &(factory->priv->max_wait)); - res = gdm_settings_direct_get_uint (GDM_KEY_MAX_WAIT_INDIRECT, - &(factory->priv->max_wait_indirect)); - res = gdm_settings_direct_get_string (GDM_KEY_WILLING, - &(factory->priv->willing_script)); + res = gdm_settings_direct_get_uint (GDM_KEY_UDP_PORT, + &(factory->priv->port)); + res = res && gdm_settings_direct_get_boolean (GDM_KEY_MULTICAST, + &(factory->priv->use_multicast)); + res = res && gdm_settings_direct_get_string (GDM_KEY_MULTICAST_ADDR, + &(factory->priv->multicast_address)); + res = res && gdm_settings_direct_get_boolean (GDM_KEY_INDIRECT, + &(factory->priv->honor_indirect)); + res = res && gdm_settings_direct_get_uint (GDM_KEY_DISPLAYS_PER_HOST, + &(factory->priv->max_displays_per_host)); + res = res && gdm_settings_direct_get_uint (GDM_KEY_MAX_SESSIONS, + &(factory->priv->max_displays)); + res = res && gdm_settings_direct_get_uint (GDM_KEY_MAX_PENDING, + &(factory->priv->max_pending_displays)); + res = res && gdm_settings_direct_get_uint (GDM_KEY_MAX_WAIT, + &(factory->priv->max_wait)); + res = res && gdm_settings_direct_get_uint (GDM_KEY_MAX_WAIT_INDIRECT, + &(factory->priv->max_wait_indirect)); + res = res && gdm_settings_direct_get_string (GDM_KEY_WILLING, + &(factory->priv->willing_script)); + + if (! res) { + return res; + } ret = open_port (factory); if (! ret) { |