diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-05-01 07:36:27 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-05-01 07:36:27 +0000 |
| commit | a9bd583ea6e6e82e41b713d8b560fd3ddbf0e08f (patch) | |
| tree | 8adb795eff91a0a27b8eb57c55ae7654e805c1a3 | |
| parent | 30a1b459a9e4fdcb342d3df12073e619a38132b9 (diff) | |
| download | gdm-a9bd583ea6e6e82e41b713d8b560fd3ddbf0e08f.tar.gz | |
Fix return of gdm_daemon_config_update_key so that it returns TRUE when
2007-05-01 Brian Cameron <brian.cameron@sun.com>
* daemon/gdm-daemon-config.c: Fix return of
gdm_daemon_config_update_key so that it returns TRUE when the
key is valid and FALSE when the key is not valid. This fixes
the UPDATE_CONFIG command so it doesn't return an error message
saying it didn't recognize the key, when it fact it is a valid
key. Also fixed "xdmcp/PARAMETERS" so we check return codes
more nicely. Fixes bug #428657.
svn path=/trunk/; revision=4884
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | daemon/gdm-daemon-config.c | 26 |
2 files changed, 34 insertions, 10 deletions
@@ -1,5 +1,23 @@ 2007-05-01 Brian Cameron <brian.cameron@sun.com> + * daemon/gdm-daemon-config.c: Fix return of + gdm_daemon_config_update_key so that it returns TRUE when the + key is valid and FALSE when the key is not valid. This fixes + the UPDATE_CONFIG command so it doesn't return an error message + saying it didn't recognize the key, when it fact it is a valid + key. Also fixed "xdmcp/PARAMETERS" so we check return codes + more nicely. Fixes bug #428657. + +2007-05-01 Brian Cameron <brian.cameron@sun.com> + + * daemon/display.[ch], daemon/server.[ch], daemon/gdm.c, + daemon/gdm-daemon-config.c: Rename gdm_server_alloc to + gdm_display_alloc since this function really initializes + this display structure and belonds in display.c rather + than in server.c. + +2007-05-01 Brian Cameron <brian.cameron@sun.com> + * daemon/display.[ch], daemon/server.c, daemon/slave.c, daemon/gdm-daemon-config.[ch], docs/C/gdm.xml: Add optional X-Gdm-XserverArgs key to the GDM desktop files. If this is diff --git a/daemon/gdm-daemon-config.c b/daemon/gdm-daemon-config.c index b3beb4bc..36a02851 100644 --- a/daemon/gdm-daemon-config.c +++ b/daemon/gdm-daemon-config.c @@ -1315,15 +1315,21 @@ gdm_daemon_config_update_key (const char *keystring) /* Shortcut for updating all XDMCP parameters */ if (is_key (keystring, "xdmcp/PARAMETERS")) { - gdm_daemon_config_update_key (GDM_KEY_DISPLAYS_PER_HOST); - gdm_daemon_config_update_key (GDM_KEY_MAX_PENDING); - gdm_daemon_config_update_key (GDM_KEY_MAX_WAIT); - gdm_daemon_config_update_key (GDM_KEY_MAX_SESSIONS); - gdm_daemon_config_update_key (GDM_KEY_INDIRECT); - gdm_daemon_config_update_key (GDM_KEY_MAX_INDIRECT); - gdm_daemon_config_update_key (GDM_KEY_MAX_WAIT_INDIRECT); - gdm_daemon_config_update_key (GDM_KEY_PING_INTERVAL); - rc = TRUE; + rc = gdm_daemon_config_update_key (GDM_KEY_DISPLAYS_PER_HOST); + if (rc == TRUE) + rc = gdm_daemon_config_update_key (GDM_KEY_MAX_PENDING); + if (rc == TRUE) + rc = gdm_daemon_config_update_key (GDM_KEY_MAX_WAIT); + if (rc == TRUE) + rc = gdm_daemon_config_update_key (GDM_KEY_MAX_SESSIONS); + if (rc == TRUE) + rc = gdm_daemon_config_update_key (GDM_KEY_INDIRECT); + if (rc == TRUE) + rc = gdm_daemon_config_update_key (GDM_KEY_MAX_INDIRECT); + if (rc == TRUE) + rc = gdm_daemon_config_update_key (GDM_KEY_MAX_WAIT_INDIRECT); + if (rc == TRUE) + rc = gdm_daemon_config_update_key (GDM_KEY_PING_INTERVAL); goto out; } @@ -1344,7 +1350,7 @@ gdm_daemon_config_update_key (const char *keystring) goto out; } - gdm_config_process_entry (daemon_config, entry, NULL); + rc = gdm_config_process_entry (daemon_config, entry, NULL); out: g_free (group); |