diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-08 23:48:17 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-08 23:48:17 +0000 |
| commit | 2d0c4aa7177a7996eb3bad4f0bd445b00491692f (patch) | |
| tree | fbd2dbce4cd2fae2cb6408b34cb034619e514c10 /chrome | |
| parent | 8870119a4797f34cdcb7f0c77327abaced5d30f7 (diff) | |
| download | chromium_src-2d0c4aa7177a7996eb3bad4f0bd445b00491692f.zip chromium_src-2d0c4aa7177a7996eb3bad4f0bd445b00491692f.tar.gz chromium_src-2d0c4aa7177a7996eb3bad4f0bd445b00491692f.tar.bz2 | |
Download filename encoding fix:
Fall back on other charsets when using the URL to suggest a filename. The URL should be escaped UTF-8, but may use another encoding instead.
BUG=44301
TEST=see bug.
Review URL: http://codereview.chromium.org/2635006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49217 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/download_item_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc index b74951b..f64b30f 100644 --- a/chrome/browser/gtk/download_item_gtk.cc +++ b/chrome/browser/gtk/download_item_gtk.cc @@ -548,7 +548,7 @@ void DownloadItemGtk::UpdateStatusLabel(GtkWidget* status_label, gtk_util::SetLabelColor(status_label, theme_provider_->UseGtkTheme() ? NULL : &text_color); - gtk_label_set_label(GTK_LABEL(status_label), status_text.c_str()); + gtk_label_set_text(GTK_LABEL(status_label), status_text.c_str()); } void DownloadItemGtk::UpdateDangerWarning() { @@ -583,8 +583,8 @@ void DownloadItemGtk::UpdateDangerWarning() { gtk_util::SetLabelColor(dangerous_label_, &color); } - gtk_label_set_label(GTK_LABEL(dangerous_label_), - WideToUTF8(dangerous_warning).c_str()); + gtk_label_set_text(GTK_LABEL(dangerous_label_), + WideToUTF8(dangerous_warning).c_str()); // Until we switch to vector graphics, force the font size. gtk_util::ForceFontSizePixels(dangerous_label_, kTextSize); |