Don't treat underscores as mnemonics in the bookmark bar....

chrome/browser/gtk/bookmark_bar_gtk.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/gtk/bookmark_bar_gtk.h"
 
 #include <vector>
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
@@ skipping 71 matching lines @@
   GtkWidget* label;
   gtk_container_foreach(GTK_CONTAINER(button), SearchForLabel, &label);
   if (label) {
     gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &kEnabledColor);
     gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &kEnabledColor);
     gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &kHighlightColor);
     gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &kDisabledColor);
   }
 }
 
+std::string DoubleUnderscores(const std::string& text) {
+  std::string ret;
+  ret.reserve(text.length() * 2);
+  for (size_t i = 0; i < text.length(); ++i) {
+    if ('_' == text[i]) {
+      ret.push_back('_');
+      ret.push_back('_');
+    } else {
+      ret.push_back(text[i]);
+    }
+  }
+
+  return ret;
+}
+
 }  // namespace
 
 BookmarkBarGtk::BookmarkBarGtk(Profile* profile, Browser* browser,
                                BrowserWindowGtk* window)
     : profile_(NULL),
       page_navigator_(NULL),
       browser_(browser),
       window_(window),
       model_(NULL),
       instructions_(NULL),
@@ skipping 302 matching lines @@
 }
 
 void BookmarkBarGtk::ConfigureButtonForNode(BookmarkNode* node,
                                             GtkWidget* button) {
   std::string tooltip = BuildTooltip(node);
   if (!tooltip.empty())
     gtk_widget_set_tooltip_text(button, tooltip.c_str());
 
   // TODO(erg): Consider a soft maximum instead of this hard 15.
   std::wstring title = node->GetTitle();
-  title = title.substr(0, std::min(title.size(), kMaxCharsOnAButton));
-  gtk_button_set_label(GTK_BUTTON(button), WideToUTF8(title).c_str());
+  // Don't treat underscores as mnemonics.
+  // O, that we could just use gtk_button_set_use_underline()!
+  // See http://bugzilla.gnome.org/show_bug.cgi?id=586330
+  std::string text = DoubleUnderscores(WideToUTF8(title));
+  text = text.substr(0, std::min(text.size(), kMaxCharsOnAButton));
+  gtk_button_set_label(GTK_BUTTON(button), text.c_str());
 
   GdkPixbuf* pixbuf = bookmark_utils::GetPixbufForNode(node, model_);
   gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_pixbuf(pixbuf));
   g_object_unref(pixbuf);
 
   SetButtonTextColors(button);
   g_object_set_data(G_OBJECT(button), kBookmarkNode,
                     reinterpret_cast<void*>(node));
 }
 
@@ skipping 391 matching lines @@
   bar->InitBackground();
   gfx::Point tabstrip_origin =
       bar->window_->tabstrip()->GetTabStripOriginForWidget(widget);
   bar->background_ninebox_->RenderTopCenterStrip(
       cr, tabstrip_origin.x(), tabstrip_origin.y(),
       event->area.x + event->area.width - tabstrip_origin.x());
   cairo_destroy(cr);
 
   return FALSE;  // Propagate expose to children.
 }