diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-04-09 04:50:47 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-04-09 04:50:47 +0000 |
| commit | 45ee4220ab7f33256f572196269588b91d9882c2 (patch) | |
| tree | 0d87498b8a6d31db14c242d328e0f4939ae17071 | |
| parent | 001597121e7028f2dee06568c71a1e9500825351 (diff) | |
| download | gdm-45ee4220ab7f33256f572196269588b91d9882c2.tar.gz | |
Fix check for GDM_KEY_PID_FILE so it matches 2.18.
2007-04-09 Brian Cameron <brian.cameron@sun.com>
* daemon/gdm.c: Fix check for GDM_KEY_PID_FILE so it matches 2.18.
svn path=/branches/gnome-2-16/; revision=4795
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | daemon/gdm.c | 14 |
2 files changed, 10 insertions, 5 deletions
@@ -6,6 +6,7 @@ * gui/gdmflexiserver.c: Report an error message when the gdmcomm_check test fails. * daemon/gdm.h: Fix typo. + * daemon/gdm.c: Fix check for GDM_KEY_PID_FILE so it matches 2.18. 2007-04-09 Brian Cameron <brian.cameron@sun.com> diff --git a/daemon/gdm.c b/daemon/gdm.c index a4fc7adc..de95cc94 100644 --- a/daemon/gdm.c +++ b/daemon/gdm.c @@ -3180,9 +3180,6 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data) done_prefetch = TRUE; } return; - } else if (strcmp (splitstr[0], GDM_KEY_PID_FILE) == 0) { - gdm_connection_printf (conn, "OK %s\n", GDM_PID_FILE); - return; } if (splitstr[0] != NULL) { @@ -3197,12 +3194,19 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data) gdm_connection_printf (conn, "OK %s\n", retval); g_free (retval); } else { - if (gdm_is_valid_key ((gchar *)splitstr[0])) + /* Check deprecated keys */ + if (strcmp (splitstr[0], + GDM_KEY_PID_FILE) == 0) { + gdm_connection_printf (conn, + "OK %s\n", GDM_PID_FILE); + return; + } else if (gdm_is_valid_key ((gchar *)splitstr[0])) { gdm_connection_printf (conn, "OK \n"); - else + } else { gdm_connection_printf (conn, "ERROR 50 Unsupported key <%s>\n", splitstr[0]); + } } g_strfreev (splitstr); } |