gtk+ r21729 - in branches/gtk-2-14: . gtk

[cdywan svn gnome org]

Author: cdywan
Date: Thu Oct 30 09:10:30 2008
New Revision: 21729
URL: http://svn.gnome.org/viewvc/gtk+?rev=21729&view=rev

Log:
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



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gtk/gtklinkbutton.c

Modified: branches/gtk-2-14/gtk/gtklinkbutton.c
==============================================================================
--- branches/gtk-2-14/gtk/gtklinkbutton.c	(original)
+++ branches/gtk-2-14/gtk/gtklinkbutton.c	Thu Oct 30 09:10:30 2008
@@ -620,7 +620,9 @@
   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;