diff options
| author | Christian Dywan <cdywan@src.gnome.org> | 2008-10-30 09:10:30 +0000 |
|---|---|---|
| committer | Christian Dywan <cdywan@src.gnome.org> | 2008-10-30 09:10:30 +0000 |
| commit | 76b8be3ec103418b08d0deccdf873f94bfd00440 (patch) | |
| tree | 37b151ebcb197c69475ccbb0ac585afe14d375eb | |
| parent | 89e5ad519752307b36c8f88951ef8bb6bdf47dda (diff) | |
| download | gdk-pixbuf-76b8be3ec103418b08d0deccdf873f94bfd00440.tar.gz | |
Bug 557316 – GtkLinkButton should consider user-defined tooltip
* gtk/gtklinkbutton.c (gtk_link_button_query_tooltip_cb):
Only override the tooltip if not previously set
svn path=/branches/gtk-2-14/; revision=21729
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gtk/gtklinkbutton.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-10-30 set REAL_NAME environment variable <kalikiana@gyokuro> + + reviewed by: <delete if not using a buddy> + + * gtk/gtklinkbutton.c (gtk_link_button_query_tooltip_cb): + 2008-10-27 Richard Hult <richard@imendio.com> Merged from trunk: diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 9a6d134e9..6db17a933 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -620,7 +620,9 @@ gtk_link_button_query_tooltip_cb (GtkWidget *widget, label = gtk_button_get_label (GTK_BUTTON (link_button)); uri = link_button->priv->uri; - if (label && *label != '\0' && uri && strcmp (label, uri) != 0) + if (!gtk_widget_get_tooltip_text (widget) + && !gtk_widget_get_tooltip_markup (widget) + && label && *label != '\0' && uri && strcmp (label, uri) != 0) { gtk_tooltip_set_text (tooltip, uri); return TRUE; |