gtk: Fix warnings for some uses of GtkLinkButton

Not setting a URI but catching the activate-link signal is a
valid use of GtkLinkButton, but we shouldn't allow showing a
popup menu which offers to copy the URI if there's none.
This commit is contained in:
Bastien Nocera 2012-05-10 15:15:43 +01:00
parent c1cfcd03a5
commit c6a7a0889c

View File

@ -526,7 +526,10 @@ gtk_link_button_button_press (GtkWidget *widget,
if (!gtk_widget_has_focus (widget)) if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget); gtk_widget_grab_focus (widget);
if (gdk_event_triggers_context_menu ((GdkEvent *) event)) /* Don't popup the menu if there's no URI set,
* otherwise the menu item will trigger a warning */
if (gdk_event_triggers_context_menu ((GdkEvent *) event) &&
GTK_LINK_BUTTON (widget)->priv->uri != NULL)
{ {
gtk_link_button_do_popup (GTK_LINK_BUTTON (widget), event); gtk_link_button_do_popup (GTK_LINK_BUTTON (widget), event);