diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2009-01-25 03:38:27 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2009-01-25 03:38:27 +0000 |
| commit | b9905c8fb53bc2875ede3512c1b4fb4dab2a62be (patch) | |
| tree | 67803bc7ba9dfd8477a4415eda54fcf2519949ba /gtk/gtkimmodule.c | |
| parent | 08b4777ae60a22d5dd8724c3c493d73dee51aea0 (diff) | |
| download | gtk+-b9905c8fb53bc2875ede3512c1b4fb4dab2a62be.tar.gz | |
Revert changes for bug 567124. Instead of trying to avoid
setting up the im context before the widget is realized, just
reset it when the client window is set.
* gtk/gtkimmulticontext.c: Reset the slave when a client window
is set.
* gtk/gtkimmodule.c
* gtk/gtktextview.c: Revert changes for bug 567124.
svn path=/trunk/; revision=22214
Diffstat (limited to 'gtk/gtkimmodule.c')
| -rw-r--r-- | gtk/gtkimmodule.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index 274166d362..58ed584116 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -671,9 +671,6 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window) GdkScreen *screen; GtkSettings *settings; - /* assertion to make sure all of the unexpected invocation is really gone. */ - g_return_val_if_fail (client_window != NULL, SIMPLE_ID); - if (!contexts_hash) gtk_im_module_initialize (); |