aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Noronha Silva <gustavo.noronha@collabora.co.uk>2009-07-18 00:07:38 +0800
committerGustavo Noronha Silva <gustavo.noronha@collabora.co.uk>2009-07-18 00:14:27 +0800
commit9a3e0650a445d9eff8006a577558503944292938 (patch)
tree2df9ad34232e379011a88df2806e5d37a3ef0013
parent6e60fdb3583e4072961a72148fe396885d037dcb (diff)
downloadgsoc2013-empathy-9a3e0650a445d9eff8006a577558503944292938.tar
gsoc2013-empathy-9a3e0650a445d9eff8006a577558503944292938.tar.gz
gsoc2013-empathy-9a3e0650a445d9eff8006a577558503944292938.tar.bz2
gsoc2013-empathy-9a3e0650a445d9eff8006a577558503944292938.tar.lz
gsoc2013-empathy-9a3e0650a445d9eff8006a577558503944292938.tar.xz
gsoc2013-empathy-9a3e0650a445d9eff8006a577558503944292938.tar.zst
gsoc2013-empathy-9a3e0650a445d9eff8006a577558503944292938.zip
Only consider what's clicked a link when priv->hovered_uri is non-NULL (Fixes: #588886)
-rw-r--r--libempathy-gtk/empathy-theme-adium.c16
1 files changed, 9 insertions, 7 deletions
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;
}