summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 20:33:40 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 20:33:40 +0000
commit2fc90935ee2fb798829265ad145a15a36a56105a (patch)
tree40565e7a0a9f4f1de8f9b64c6d7d8dc9b0befe01 /chrome
parentc33ab08d62663fff70526b1a3d5b2a57c487ac06 (diff)
downloadchromium_src-2fc90935ee2fb798829265ad145a15a36a56105a.zip
chromium_src-2fc90935ee2fb798829265ad145a15a36a56105a.tar.gz
chromium_src-2fc90935ee2fb798829265ad145a15a36a56105a.tar.bz2
Fix bookmark util crash
BUG=http://crbug.com/15853 TEST=none Review URL: http://codereview.chromium.org/155004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gtk/bookmark_utils_gtk.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc
index c78ade7..5a0d1aa 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/gtk/bookmark_utils_gtk.cc
@@ -103,6 +103,10 @@ GtkWidget* GetDragRepresentation(const BookmarkNode* node,
void ConfigureButtonForNode(const BookmarkNode* node, BookmarkModel* model,
GtkWidget* button) {
+ GtkWidget* former_child = gtk_bin_get_child(GTK_BIN(button));
+ if (former_child)
+ gtk_container_remove(GTK_CONTAINER(button), former_child);
+
std::string tooltip = BuildTooltipFor(node);
if (!tooltip.empty())
gtk_widget_set_tooltip_text(button, tooltip.c_str());