From 9a3e0650a445d9eff8006a577558503944292938 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva Date: Fri, 17 Jul 2009 17:07:38 +0100 Subject: Only consider what's clicked a link when priv->hovered_uri is non-NULL (Fixes: #588886) --- libempathy-gtk/empathy-theme-adium.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'libempathy-gtk/empathy-theme-adium.c') diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 6d270a6cd..3fd4932a7 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -184,12 +184,14 @@ theme_adium_populate_popup_cb (WebKitWebView *view, GtkMenu *menu, gpointer user_data) { - GtkWidget *item; - GList *items; - GtkWidget *icon; - gchar *stock_id; - gboolean is_link = FALSE; - gboolean developer_tools_enabled; + EmpathyThemeAdium *theme = EMPATHY_THEME_ADIUM (view); + EmpathyThemeAdiumPriv *priv = GET_PRIV (theme); + GtkWidget *item; + GList *items; + GtkWidget *icon; + gchar *stock_id; + gboolean is_link = FALSE; + gboolean developer_tools_enabled; /* FIXME: WebKitGTK+'s context menu API clearly needs an * overhaul. There is currently no way to know what is being @@ -204,7 +206,7 @@ theme_adium_populate_popup_cb (WebKitWebView *view, icon = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (item)); gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL); - if (!strcmp (stock_id, GTK_STOCK_OPEN)) + if ((!strcmp (stock_id, GTK_STOCK_OPEN)) && priv->hovered_uri) is_link = TRUE; } -- cgit v1.2.3