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=/trunk/; revision=21728

ChangeLog

+2008-10-30  Christian Dywan  <christian@imendio.com>
+
+	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
+
 2008-10-29  Christian Dywan  <christian@imendio.com>
 
 	Bug 557762 – Misleading error message in GDK DirectFB

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;