Restore the hovering-over-link callback in Fancy viewer.

[claws.git] / src / plugins / fancy / fancy_viewer.c

diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index ca0da6096dc2dd25aa71d2fd4ef9e20dff50ccc5..52a90e5c772eeaf5ae8eb3a921ea9036ad8fc407 100644 (file)
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -287,7 +287,7 @@ static void fancy_show_notice(FancyViewer *viewer, const gchar *message)
        gtk_label_set_text(GTK_LABEL(viewer->l_link), message);
 }
 
-static gint fancy_show_mimepart_prepare(MimeViewer *_viewer)
+static gboolean fancy_show_mimepart_prepare(MimeViewer *_viewer)
 {
        FancyViewer *viewer = (FancyViewer *) _viewer;
 
@@ -301,7 +301,7 @@ static void fancy_show_mimepart(MimeViewer *_viewer, const gchar *infile,
        FancyViewer *viewer = (FancyViewer *) _viewer;
        viewer->to_load = partinfo;
        viewer->loading = TRUE;
-       g_timeout_add(5, (GtkFunction)fancy_show_mimepart_prepare, viewer);
+       g_timeout_add(5, (GSourceFunc)fancy_show_mimepart_prepare, viewer);
 }
 
 static void fancy_print(MimeViewer *_viewer)
@@ -321,10 +321,8 @@ static void fancy_print(MimeViewer *_viewer)
        /* Config for printing */
        gtk_print_operation_set_print_settings(op, printing_get_settings());
        gtk_print_operation_set_default_page_setup(op, printing_get_page_setup());
-#if GTK_CHECK_VERSION(2,18,0)
         /* enable Page Size and Orientation in the print dialog */
        gtk_print_operation_set_embed_page_setup(op, TRUE);
-#endif
 
        /* Start printing process */
        res = webkit_web_frame_print_full(webkit_web_view_get_main_frame(viewer->view),
@@ -583,14 +581,10 @@ static void load_finished_cb(WebKitWebView *view, gint progress,
 }
 
 static void over_link_cb(WebKitWebView *view, const gchar *wtf,
-                        const gchar *link, FancyViewer *viewer, void *wtfa)
+               const gchar *link, FancyViewer *viewer, void *wtfa)
 {
+       /* Display the link in the bottom statusbar. */
        gtk_label_set_text(GTK_LABEL(viewer->l_link), link);
-       g_free(viewer->cur_link);
-       viewer->cur_link = NULL;
-       if(link) {
-               viewer->cur_link = g_strdup(link);
-       }
 }
 
 static void load_progress_cb(WebKitWebView *view, GParamSpec* pspec,
@@ -830,13 +824,35 @@ static void viewer_menu_handler(GtkWidget *menuitem, FancyViewer *viewer)
        }
 }
 
-static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu,
-                                  FancyViewer *viewer)
+static gboolean context_menu_cb (WebKitWebView *view, GtkWidget *menu,
+               WebKitHitTestResult *hit_test_result,
+               gboolean triggered_with_keyboard,
+               gpointer user_data)
 {
+       FancyViewer *viewer = (FancyViewer *)user_data;
        Plugin *plugin = plugin_get_loaded_by_name("RSSyl");
+       WebKitHitTestResultContext context;
+       gchar *link_uri = NULL;
+
+       g_object_get(G_OBJECT(hit_test_result),
+                       "context", &context,
+                       "link-uri", &link_uri,
+                       NULL);
+
+       debug_print("context %d, link-uri '%s'\n", context,
+                       (link_uri != NULL ? link_uri : "(null)"));
+       if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK &&
+                       link_uri != NULL) {
+               if (viewer->cur_link != NULL)
+                       g_free(viewer->cur_link);
+               /* g_object_get() already made a copy, no need to strdup() here */
+               viewer->cur_link = link_uri;
+       }
+
        gtk_container_foreach(GTK_CONTAINER(menu),
                              (GtkCallback)viewer_menu_handler,
                              viewer);
+
        if (plugin) {
                GtkWidget *rssyl = gtk_image_menu_item_new_with_label(_("Import feed"));
                GtkWidget *img = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
@@ -847,7 +863,8 @@ static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu,
                                 G_CALLBACK(import_feed_cb),
                                 (gpointer *) viewer);
        }
-       return TRUE;
+
+       return FALSE;
 }
 
 static gint keypress_events_cb (GtkWidget *widget, GdkEventKey *event,
@@ -855,13 +872,13 @@ static gint keypress_events_cb (GtkWidget *widget, GdkEventKey *event,
 {
        if (event->state == CTRL_KEY) {
                switch (event->keyval) {
-               case GDK_plus:
+               case GDK_KEY_plus:
                        zoom_in_cb(viewer->ev_zoom_in, NULL, viewer);
                        break;
-               case GDK_period:
+               case GDK_KEY_period:
                        zoom_100_cb(viewer->ev_zoom_100, NULL, viewer);
                        break;
-               case GDK_minus:
+               case GDK_KEY_minus:
                        zoom_out_cb(viewer->ev_zoom_out, NULL, viewer);
                        break;
                }
@@ -1065,7 +1082,7 @@ static MimeViewer *fancy_viewer_create(void)
        g_signal_connect(G_OBJECT(viewer->view), "load-finished",
                         G_CALLBACK(load_finished_cb), viewer);
        g_signal_connect(G_OBJECT(viewer->view), "hovering-over-link",
-                        G_CALLBACK(over_link_cb), viewer);
+                       G_CALLBACK(over_link_cb), viewer);
 
        g_signal_connect(G_OBJECT(viewer->view), "notify::progress",
                         G_CALLBACK(load_progress_cb), viewer);
@@ -1077,8 +1094,8 @@ static MimeViewer *fancy_viewer_create(void)
 
        g_signal_connect(G_OBJECT(viewer->view), "resource-request-starting",
                        G_CALLBACK(resource_request_starting_cb), viewer);
-       g_signal_connect(G_OBJECT(viewer->view), "populate-popup",
-                        G_CALLBACK(populate_popup_cb), viewer);
+       g_signal_connect(G_OBJECT(viewer->view), "context-menu",
+                       G_CALLBACK(context_menu_cb), viewer);
        g_signal_connect(G_OBJECT(viewer->view), "button-press-event",
                         G_CALLBACK(press_button_cb), viewer);
        g_signal_connect(G_OBJECT(viewer->view), "button-release-event",