From c6a7a0889c34fae72953a8e74a5eca664f3bd99b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 10 May 2012 15:15:43 +0100 Subject: [PATCH] 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. --- gtk/gtklinkbutton.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 15a52f6a85..b5981c741f 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -526,7 +526,10 @@ gtk_link_button_button_press (GtkWidget *widget, if (!gtk_widget_has_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);