diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 02:35:30 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 02:35:30 +0000 |
| commit | 0c534273b9592e78a0e5392449814c13a1e3285c (patch) | |
| tree | 59a29ff26eaddaa2f65e3ba14ebd23c55ab1c160 /views | |
| parent | fe72c2268226c301ec4ee1c1b43a8ec454de19cb (diff) | |
| download | chromium_src-0c534273b9592e78a0e5392449814c13a1e3285c.zip chromium_src-0c534273b9592e78a0e5392449814c13a1e3285c.tar.gz chromium_src-0c534273b9592e78a0e5392449814c13a1e3285c.tar.bz2 | |
Prefer UTF8 strings over ASCII strings when requesting text from a
drag and drop operation
BUG=chromium-os:12275
TEST=Manual
Review URL: http://codereview.chromium.org/6825035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/drop_target_gtk.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/views/widget/drop_target_gtk.cc b/views/widget/drop_target_gtk.cc index ee2abfd..5025ae4 100644 --- a/views/widget/drop_target_gtk.cc +++ b/views/widget/drop_target_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -273,25 +273,25 @@ void DropTargetGtk::RequestFormats(GdkDragContext* context, if ((formats & OSExchangeData::STRING) != 0 && (requested_formats_ & OSExchangeData::STRING) == 0) { requested_formats_ |= OSExchangeData::STRING; - if (known_formats.count(GDK_TARGET_STRING)) { - gtk_drag_get_data(widget, context, GDK_TARGET_STRING, time); - } else if (known_formats.count(gdk_atom_intern("text/plain", false))) { - gtk_drag_get_data(widget, context, gdk_atom_intern("text/plain", false), - time); + if (known_formats.count(gdk_atom_intern("UTF8_STRING", false))) { + gtk_drag_get_data(widget, context, + gdk_atom_intern("UTF8_STRING", false), time); } else if (known_formats.count(gdk_atom_intern("text/plain;charset=utf-8", false))) { gtk_drag_get_data(widget, context, gdk_atom_intern("text/plain;charset=utf-8", false), time); + } else if (known_formats.count(GDK_TARGET_STRING)) { + gtk_drag_get_data(widget, context, GDK_TARGET_STRING, time); + } else if (known_formats.count(gdk_atom_intern("text/plain", false))) { + gtk_drag_get_data(widget, context, gdk_atom_intern("text/plain", false), + time); } else if (known_formats.count(gdk_atom_intern("TEXT", false))) { gtk_drag_get_data(widget, context, gdk_atom_intern("TEXT", false), time); } else if (known_formats.count(gdk_atom_intern("STRING", false))) { gtk_drag_get_data(widget, context, gdk_atom_intern("STRING", false), time); - } else if (known_formats.count(gdk_atom_intern("UTF8_STRING", false))) { - gtk_drag_get_data(widget, context, - gdk_atom_intern("UTF8_STRING", false), time); } } if ((formats & OSExchangeData::URL) != 0 && |