summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/gtk_im_context_wrapper.cc
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 19:12:53 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 19:12:53 +0000
commitdb89440b21bf4950a18f4479aaa961cfe13de035 (patch)
tree751748488e9d42892835457bed3b91495bd4e1fa /content/browser/renderer_host/gtk_im_context_wrapper.cc
parentda7582b7e45e5f0aac0a1b072580be65b1502334 (diff)
downloadchromium_src-db89440b21bf4950a18f4479aaa961cfe13de035.zip
chromium_src-db89440b21bf4950a18f4479aaa961cfe13de035.tar.gz
chromium_src-db89440b21bf4950a18f4479aaa961cfe13de035.tar.bz2
GTK: Seal up GSEALs, focusing on GtkSelectionData.
BUG=79722 TEST=compiles First Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=116956 Review URL: http://codereview.chromium.org/9151007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/gtk_im_context_wrapper.cc')
-rw-r--r--content/browser/renderer_host/gtk_im_context_wrapper.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/content/browser/renderer_host/gtk_im_context_wrapper.cc b/content/browser/renderer_host/gtk_im_context_wrapper.cc
index 728e37e..414b9ac 100644
--- a/content/browser/renderer_host/gtk_im_context_wrapper.cc
+++ b/content/browser/renderer_host/gtk_im_context_wrapper.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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,9 +589,10 @@ void GtkIMContextWrapper::HandleHostViewRealize(GtkWidget* widget) {
// 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.
- if (widget->window) {
- gtk_im_context_set_client_window(context_, widget->window);
- gtk_im_context_set_client_window(context_simple_, widget->window);
+ 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);
}
}