| Index: content/browser/renderer_host/gtk_im_context_wrapper.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/gtk_im_context_wrapper.cc (revision 116976)
|
| +++ content/browser/renderer_host/gtk_im_context_wrapper.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -589,10 +589,9 @@
|
| // We should only set im context's client window once, because when setting
|
| // client window.im context may destroy and recreate its internal states and
|
| // objects.
|
| - GdkWindow* gdk_window = gtk_widget_get_window(widget);
|
| - if (gdk_window) {
|
| - gtk_im_context_set_client_window(context_, gdk_window);
|
| - gtk_im_context_set_client_window(context_simple_, gdk_window);
|
| + if (widget->window) {
|
| + gtk_im_context_set_client_window(context_, widget->window);
|
| + gtk_im_context_set_client_window(context_simple_, widget->window);
|
| }
|
| }
|
|
|
|
|
| Property changes on: content/browser/renderer_host/gtk_im_context_wrapper.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|