[empathy] Only consider what's clicked a link when priv->hovered_uri is non-NULL (Fixes: #588886)



commit 9a3e0650a445d9eff8006a577558503944292938
Author: Gustavo Noronha Silva <gustavo noronha collabora co uk>
Date:   Fri Jul 17 17:07:38 2009 +0100

    Only consider what's clicked a link when priv->hovered_uri is non-NULL (Fixes: #588886)

 libempathy-gtk/empathy-theme-adium.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 6d270a6..3fd4932 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;
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]