|
 |
1df2df1 |
From 51669cb03613b36b0b1798b1f8d2bba85b3e2a49 Mon Sep 17 00:00:00 2001
|
|
|
1df2df1 |
From: Martin Pitt <martin.pitt@ubuntu.com>
|
|
|
1df2df1 |
Date: Mon, 18 Jan 2010 16:09:58 +0100
|
|
|
1df2df1 |
Subject: [PATCH] Fix crash in getting system keyboard layout
|
|
|
1df2df1 |
|
|
|
1df2df1 |
In get_system_default_layout(), use a static variable for
|
|
|
1df2df1 |
xkl_engine_get_instance() result, and don't close the X Display.
|
|
|
1df2df1 |
|
|
|
1df2df1 |
This fixes the crash that happens at the second call of
|
|
|
1df2df1 |
get_system_default_layout(): xkl_engine_get_instance() returns a singleton
|
|
|
1df2df1 |
which saves the passed X Display instance, so we must never close it.
|
|
|
1df2df1 |
|
|
|
1df2df1 |
https://launchpad.net/bugs/505972
|
|
|
1df2df1 |
---
|
|
|
1df2df1 |
daemon/gdm-session-direct.c | 23 ++++++++++++-----------
|
|
|
1df2df1 |
1 files changed, 12 insertions(+), 11 deletions(-)
|
|
|
1df2df1 |
|
|
|
1df2df1 |
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
|
|
|
1df2df1 |
index 011a919..d2e1a83 100644
|
|
|
1df2df1 |
--- a/daemon/gdm-session-direct.c
|
|
|
1df2df1 |
+++ b/daemon/gdm-session-direct.c
|
|
|
1df2df1 |
@@ -601,16 +601,19 @@ get_default_language_name (GdmSessionDirect *session)
|
|
|
1df2df1 |
static char *
|
|
|
1df2df1 |
get_system_default_layout (GdmSessionDirect *session)
|
|
|
1df2df1 |
{
|
|
|
1df2df1 |
- char *result;
|
|
|
1df2df1 |
- Display *display;
|
|
|
1df2df1 |
+ char *result = NULL;
|
|
|
1df2df1 |
+ static XklEngine *engine = NULL;
|
|
|
1df2df1 |
|
|
|
1df2df1 |
- result = NULL;
|
|
|
1df2df1 |
- display = XOpenDisplay (session->priv->display_name);
|
|
|
1df2df1 |
- if (display) {
|
|
|
1df2df1 |
- XklConfigRec *config;
|
|
|
1df2df1 |
- XklEngine *engine = xkl_engine_get_instance (display);
|
|
|
1df2df1 |
- if (engine)
|
|
|
1df2df1 |
- {
|
|
|
1df2df1 |
+ if (engine == NULL) {
|
|
|
1df2df1 |
+ Display *display = XOpenDisplay (session->priv->display_name);
|
|
|
1df2df1 |
+ if (display != NULL) {
|
|
|
1df2df1 |
+ engine = xkl_engine_get_instance (display);
|
|
|
1df2df1 |
+ }
|
|
|
1df2df1 |
+ /* do NOT call XCloseDisplay (display) here;
|
|
|
1df2df1 |
+ * xkl_engine_get_instance() is a singleton which saves the display */
|
|
|
1df2df1 |
+ }
|
|
|
1df2df1 |
+
|
|
|
1df2df1 |
+ if (engine != NULL) {
|
|
|
1df2df1 |
XklConfigRec *config = xkl_config_rec_new ();
|
|
|
1df2df1 |
if (xkl_config_rec_get_from_server (config, engine) && config->layouts && config->layouts[0]) {
|
|
|
1df2df1 |
if (config->variants && config->variants[0] && config->variants[0][0])
|
|
|
1df2df1 |
@@ -619,8 +622,6 @@ get_system_default_layout (GdmSessionDirect *session)
|
|
|
1df2df1 |
result = g_strdup (config->layouts[0]);
|
|
|
1df2df1 |
}
|
|
|
1df2df1 |
g_object_unref (config);
|
|
|
1df2df1 |
- }
|
|
|
1df2df1 |
- XCloseDisplay (display);
|
|
|
1df2df1 |
}
|
|
|
1df2df1 |
|
|
|
1df2df1 |
if (!result)
|
|
|
1df2df1 |
--
|
|
|
1df2df1 |
1.6.6
|
|
|
1df2df1 |
|