Fixes #1414 blank preview pane.

lwindolf · lwindolf · commit a33d641660d0 · 2025-02-25T18:55:32.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,17 @@
+2025-02-25  Lars Windolf <lars.windolf@gmx.de>
+
+	Version 1.16-RC2
+
+	* Fixes #1414 Blank preview pane (when Javascript preference is disabled)
+	  (Lars Windolf, reported by Filip Danilović)
+
+	* Updated Spanish translation
+	  (Cristian Othón Martínez Vera)
+
+	* Updated German translation
+	  (Lars Windolf)
+
+
 2025-02-09  Lars Windolf <lars.windolf@gmx.de>
 
 	Version 1.16-RC1
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([liferea],[1.16-RC1],[liferea-devel@lists.sourceforge.net])
+AC_INIT([liferea],[1.16-RC2],[liferea-devel@lists.sourceforge.net])
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/feedlist.c])
 
diff --git a/src/ui/liferea_browser.c b/src/ui/liferea_browser.c
@@ -317,33 +317,10 @@ liferea_browser_get_widget (LifereaBrowser *browser)
 	return browser->container;
 }
 
-void
-liferea_browser_write (LifereaBrowser *browser, const gchar *string, const gchar *base)
-{
-	const gchar	*baseURL = base;
-	const gchar	*errMsg = "ERROR: Invalid encoded UTF8 buffer passed to HTML widget! This shouldn't happen.";
-
-	if (!browser)
-		return;
-
-	if (baseURL == NULL)
-		baseURL = "file:///";
-
-	if (!g_utf8_validate (string, -1, NULL)) {
-		/* It is really a bug if we get invalid encoded UTF-8 here!!! */
-		liferea_webkit_write_html (browser->renderWidget, errMsg, strlen (errMsg), baseURL, "text/plain");
-	} else {
-		liferea_webkit_write_html (browser->renderWidget, string, strlen (string), baseURL, "text/html");
-	}
-
-	/* We hide the toolbar as it should only be shown when loading external content */
-	gtk_widget_hide (browser->toolbar);
-}
-
 void
 liferea_browser_clear (LifereaBrowser *browser)
 {
-	liferea_browser_write (browser, "<html><body></body></html>", NULL);
+	liferea_webkit_clear (browser->renderWidget);
 }
 
 struct internalUriType {
@@ -595,8 +572,6 @@ liferea_browser_set_view (LifereaBrowser *browser, const gchar *name, const gcha
 	tmp = g_string_new (liferea_browser_get_template (browser, name));
 	g_string_replace (tmp, "REPLACE_MARKER", script, 1);
 
-	// do not use liferea_browser_write() as we need to write XHTML here
-	// which is produced by intltool
 	liferea_webkit_write_html (browser->renderWidget, tmp->str, strlen (tmp->str), baseURL, "text/html");
 }
 
diff --git a/src/ui/liferea_browser.h b/src/ui/liferea_browser.h
@@ -68,16 +68,6 @@ GtkWidget *liferea_browser_get_widget (LifereaBrowser *browser);
  */
 void	liferea_browser_clear (LifereaBrowser *browser);
 
-/**
- * liferea_browser_write: (skip)
- * @browser:		the browser widget to be set
- * @string:		HTML source
- * @base:		base url for resolving relative links
- *
- * Method to display the passed HTML source to the HTML widget.
- */
-void	liferea_browser_write (LifereaBrowser *browser, const gchar *string, const gchar *base);
-
 /**
  * liferea_html_view_on_url: (skip)
  * @browser:		the browser causing the event
diff --git a/src/webkit/liferea_web_view.c b/src/webkit/liferea_web_view.c
@@ -276,24 +276,13 @@ on_popup_webinspector_activate (GSimpleAction *action, GVariant *parameter, gpoi
 	webkit_web_inspector_show (WEBKIT_WEB_INSPECTOR(inspector));
 }
 
-static void
-on_popup_toggle_reader_mode_change_state (GSimpleAction *action, GVariant *parameter, gpointer user_data)
-{
-	WebKitWebView *webview = WEBKIT_WEB_VIEW (user_data);
-	gboolean reader = g_variant_get_boolean (parameter);
-
-	//liferea_browser_set_reader_mode (g_object_get_data (G_OBJECT (webview), "htmlview"), reader);
-	g_simple_action_set_state (action, g_variant_new_boolean (reader));
-}
-
 static const GActionEntry liferea_web_view_gaction_entries[] = {
 	{"save-link", on_popup_save_link_activate, "s", NULL, NULL},
 	{"subscribe-link", on_popup_subscribe_link_activate, "s", NULL, NULL},
 	{"copy-selection", on_popup_copy_activate, NULL, NULL, NULL},
 	{"zoom-in", on_popup_zoomin_activate, NULL, NULL, NULL},
 	{"zoom-out", on_popup_zoomout_activate, NULL, NULL, NULL},
-	{"web-inspector", on_popup_webinspector_activate, NULL, NULL, NULL},
-	{"toggle-reader-mode", NULL, NULL, "true", on_popup_toggle_reader_mode_change_state}
+	{"web-inspector", on_popup_webinspector_activate, NULL, NULL, NULL}
 };
 
 static void
@@ -593,14 +582,6 @@ liferea_web_view_load_status_changed (WebKitWebView *view, WebKitLoadEvent event
 	switch (event) {
 		case WEBKIT_LOAD_STARTED:
 			{
-				// Once load starts we can update the reader toggle
-				/*GActionGroup *action_group;
-				action_group = LIFEREA_WEB_VIEW (view)->menu_action_group;
-				GSimpleAction *reader_action;
-				reader_action = G_SIMPLE_ACTION (g_action_map_lookup_action (G_ACTION_MAP (action_group), "toggle-reader-mode"));
-				gboolean reader = liferea_browser_get_reader_mode (htmlview);
-				g_simple_action_set_state (reader_action, g_variant_new_boolean (reader));*/
-
 				// Hack to force webview exit from fullscreen mode on new page
 				isFullscreen = GPOINTER_TO_INT(g_object_steal_data(
 							G_OBJECT(view), "fullscreen_on"));
diff --git a/src/webkit/webkit.c b/src/webkit/webkit.c
@@ -134,11 +134,9 @@ liferea_webkit_enable_itp_cb (GSettings *gsettings,
 {
 	g_return_if_fail (key != NULL);
 
-#if WEBKIT_CHECK_VERSION (2, 30, 0)
 	webkit_website_data_manager_set_itp_enabled (
 	    webkit_web_context_get_website_data_manager (webkit_web_context_get_default()),
 	    g_settings_get_boolean (gsettings, key));
-#endif
 }
 
 /* Font size math from Epiphany embed/ephy-embed-prefs.c to get font size in
@@ -247,9 +245,8 @@ liferea_webkit_on_dbus_connection_close (GDBusConnection *connection,
 	LifereaWebKit *webkit_impl = LIFEREA_WEBKIT (user_data);
 
 	if (!remote_peer_vanished && error)
-	{
 		g_warning ("DBus connection closed with error : %s", error->message);
-	}
+
 	webkit_impl->dbus_connections = g_list_remove (webkit_impl->dbus_connections, connection);
 	g_object_unref (connection);
 }
@@ -280,9 +277,8 @@ on_page_created (LifereaWebKit *instance,
 		 guint64 page_id,
 		 gpointer web_view)
 {
-	if (webkit_web_view_get_page_id (WEBKIT_WEB_VIEW (web_view)) == page_id) {
+	if (webkit_web_view_get_page_id (WEBKIT_WEB_VIEW (web_view)) == page_id)
 		liferea_web_view_set_dbus_connection (LIFEREA_WEB_VIEW (web_view), connection);
-	}
 }
 
 
@@ -408,7 +404,7 @@ liferea_webkit_init (LifereaWebKit *self)
 	WebKitWebsiteDataManager	*website_data_manager;
 		
 	self->dbus_connections = NULL;
-	webkit_web_context_register_uri_scheme (webkit_web_context_get_default(), "liferea",
+	webkit_web_context_register_uri_scheme (webkit_web_context_get_default (), "liferea",
 		(WebKitURISchemeRequestCallback) liferea_webkit_handle_liferea_scheme,NULL,NULL);
 
 	security_manager = webkit_web_context_get_security_manager (webkit_web_context_get_default ());
@@ -460,6 +456,9 @@ liferea_webkit_write_html (
 {
 	// FIXME Avoid doing a copy ?
 	GBytes *string_bytes = g_bytes_new (string, length);
+
+	g_object_set (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (webview)), "enable-javascript", TRUE, NULL);
+
 	/* Note: we explicitely ignore the passed base URL
 	   because we don't need it as Webkit supports <div href="">
 	   and throws a security exception when accessing file://
@@ -475,28 +474,15 @@ liferea_webkit_write_html (
 }
 
 void
-liferea_webkit_run_js (GtkWidget *widget, gchar *js, GAsyncReadyCallback cb)
+liferea_webkit_clear (GtkWidget *webview)
 {
-	// No matter what was before we need JS now
-	g_object_set (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (widget)), "enable-javascript", TRUE, NULL);
-
-	webkit_web_view_evaluate_javascript (
-		WEBKIT_WEB_VIEW (widget),
-		js,
-		-1,
-		NULL,
-		NULL,
-		NULL,
-		cb,
-		g_object_get_data (G_OBJECT (widget), "htmlview")
-	);
-	g_free (js);
+	webkit_web_view_load_html (WEBKIT_WEB_VIEW (webview), "", NULL);
 }
 
 static void
 liferea_webkit_set_font_size (GtkWidget *widget, gpointer user_data)
 {
-	WebKitSettings	*settings = WEBKIT_SETTINGS(user_data);
+	WebKitSettings	*settings = WEBKIT_SETTINGS (user_data);
 	gchar		*font;
 	guint		fontSize;
 
@@ -647,7 +633,6 @@ liferea_webkit_scroll_pagedown (GtkWidget *webview)
 void
 liferea_webkit_set_proxy (ProxyDetectMode mode)
 {
-#if WEBKIT_CHECK_VERSION (2, 15, 3)
 	switch (mode) {
 		default:
 		case PROXY_DETECT_MODE_MANUAL:
@@ -664,7 +649,6 @@ liferea_webkit_set_proxy (ProxyDetectMode mode)
 			     NULL);
 			break;
 	}
-#endif
 }
 
 /**
diff --git a/src/webkit/webkit.h b/src/webkit/webkit.h
@@ -125,20 +125,18 @@ void liferea_webkit_reload (GtkWidget *webview);
  * @length:		string length
  * @base: (nullable): 	base URI
  * @content_type:	HTTP content type string
- *
+  *
  * Load an HTML string into the web view. This is used to render
  * HTML documents created internally.
  */
 void liferea_webkit_write_html (GtkWidget *webview, const gchar *string, const guint length, const gchar *base, const gchar *content_type);
 
 /**
- * liferea_webkit_run_js:
- * @webview:		the WebkitWebView
- * @js:			the Javascript string
- * @cb:                 the JS callback
+ * liferea_webkit_clear:
+ * @webview:	the WebkitWebView
  *
- * Run an Javascript against the webview
+ * Clear the webview
  */
-void liferea_webkit_run_js (GtkWidget *widget, gchar *js, GAsyncReadyCallback cb);
+void liferea_webkit_clear (GtkWidget *webview);
 
 #endif

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 dnl Process this file with autoconf to produce a configure script.
 -AC_INIT([liferea],[1.16-RC1],[[email protected]])
 +AC_INIT([liferea],[1.16-RC2],[[email protected]])
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/feedlist.c])