[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-595-g7db9a87

iwkse at claws-mail.org iwkse at claws-mail.org
Mon Jan 14 16:43:52 CET 2019


The branch, gtk3 has been updated
       via  7db9a87156cadf09ceadc4a0979e08532b5e367c (commit)
      from  095a3ea4044ce905bf495324a20b223bcf1c30ca (commit)

Summary of changes:
 src/plugins/fancy/fancy_viewer.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 7db9a87156cadf09ceadc4a0979e08532b5e367c
Author: iwkse <iwkse at claws-mail.org>
Date:   Mon Jan 14 16:43:44 2019 +0100

    Fix context-menu crash, thanks to Ticho

diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 74dbdf7..cd5a77e 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -827,20 +827,20 @@ static void viewer_menu_handler(GtkWidget *menuitem, FancyViewer *viewer)
 }
 
 static gboolean context_menu_cb (WebKitWebView *view, WebKitContextMenu *menu,
-        GdkEvent *event, WebKitHitTestResult *hit_test_result,
-		gboolean triggered_with_keyboard,
-		gpointer user_data)
+                                 GdkEvent *event, WebKitHitTestResult *hit_test_result,
+                                 gpointer user_data)
 {
 	FancyViewer *viewer = (FancyViewer *)user_data;
 	Plugin *plugin = plugin_get_loaded_by_name("RSSyl");
 	WebKitHitTestResultContext context;
-    context = webkit_hit_test_result_get_context(hit_test_result);
 	gchar *link_uri = NULL;
 
+    context = webkit_hit_test_result_get_context(hit_test_result);
+
     link_uri = webkit_hit_test_result_get_link_uri(hit_test_result);
 
-//	debug_print("context %d, link-uri '%s'\n", context,
-//			(link_uri != NULL ? 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 != NULL && viewer->cur_link != NULL) {
@@ -850,9 +850,9 @@ static gboolean context_menu_cb (WebKitWebView *view, WebKitContextMenu *menu,
         }
 	}
 
-/*	gtk_container_foreach(GTK_CONTAINER(menu),
+	gtk_container_foreach(GTK_CONTAINER(menu),
 			      (GtkCallback)viewer_menu_handler,
-			      viewer);*/
+			      viewer);
 
 	if (plugin) {
 		GtkWidget *rssyl = gtk_image_menu_item_new_with_label(_("Import feed"));

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list