diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-12-29 23:43:28 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-12-29 23:43:51 -0500 |
| commit | ebd28de588ff2db2f5198ef742cf88fa3c4b3d40 (patch) | |
| tree | d1d8f43d0827e52f6d00c499c2f9bca0c2841fab /modules | |
| parent | 3c70a1278518604fe081a6f1923bd127d1269846 (diff) | |
| download | gtk+-ebd28de588ff2db2f5198ef742cf88fa3c4b3d40.tar.gz | |
XIM: gracefully deal with non-X backends
Patch by Young-Ho Cha, bug 660309.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/gtkimcontextxim.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index 84f2379188..3241b60dbe 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -650,6 +650,8 @@ gtk_im_context_xim_new (void) GtkIMContextXIM *result; const gchar *charset; + if (!GDK_IS_X11_DISPLAY(gdk_display_get_default())) + return NULL; result = g_object_new (GTK_TYPE_IM_CONTEXT_XIM, NULL); result->locale = g_strdup (setlocale (LC_CTYPE, NULL)); |