diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2010-01-18 16:09:58 +0100 |
---|---|---|
committer | Martin Pitt <martin.pitt@ubuntu.com> | 2010-01-18 16:09:58 +0100 |
commit | 51669cb03613b36b0b1798b1f8d2bba85b3e2a49 (patch) | |
tree | 042ad3b051f345a2a86faa45fe839393622f4091 /daemon | |
parent | 70ae0a9db424337ed00079601a9d38d7c3db28bb (diff) | |
download | gdm-51669cb03613b36b0b1798b1f8d2bba85b3e2a49.tar.gz |
Fix crash in getting system keyboard layout
In get_system_default_layout(), use a static variable for
xkl_engine_get_instance() result, and don't close the X Display.
This fixes the crash that happens at the second call of
get_system_default_layout(): xkl_engine_get_instance() returns a singleton
which saves the passed X Display instance, so we must never close it.
https://launchpad.net/bugs/505972
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/gdm-session-direct.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c index 011a919b..d2e1a837 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -601,16 +601,19 @@ get_default_language_name (GdmSessionDirect *session) static char * get_system_default_layout (GdmSessionDirect *session) { - char *result; - Display *display; + char *result = NULL; + static XklEngine *engine = NULL; - result = NULL; - display = XOpenDisplay (session->priv->display_name); - if (display) { - XklConfigRec *config; - XklEngine *engine = xkl_engine_get_instance (display); - if (engine) - { + if (engine == NULL) { + Display *display = XOpenDisplay (session->priv->display_name); + if (display != NULL) { + engine = xkl_engine_get_instance (display); + } + /* do NOT call XCloseDisplay (display) here; + * xkl_engine_get_instance() is a singleton which saves the display */ + } + + if (engine != NULL) { XklConfigRec *config = xkl_config_rec_new (); if (xkl_config_rec_get_from_server (config, engine) && config->layouts && config->layouts[0]) { if (config->variants && config->variants[0] && config->variants[0][0]) @@ -619,8 +622,6 @@ get_system_default_layout (GdmSessionDirect *session) result = g_strdup (config->layouts[0]); } g_object_unref (config); - } - XCloseDisplay (display); } if (!result) |