[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-30-g749416c7f

[jonathan at claws-mail.org]

The branch, gtk3 has been updated
       via  749416c7fb89ac69d002dd0e328a59ca0030105e (commit)
       via  9674154cb67aa8c9fe672a285730233ab7df68d8 (commit)
      from  8eaf132bdbd82f8b5c8efc15a5a2660cef9b796a (commit)

Summary of changes:
 src/plugins/litehtml_viewer/container_linux_images.cpp | 12 +++++++-----
 src/toolbar.c                                          |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 749416c7fb89ac69d002dd0e328a59ca0030105e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Jul 31 20:40:30 2021 -0700

    LiteHTML pixbuf cache fixes
    
    Add a missing call to unlock_images_cache
    
    Move the check for blocking remote content to before inserting the NULL
    entry into the cache.  Otherwise the NULL entries will remain if remote
    content is enabled later on, which prevents further attempts to download it.

diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
index 1e0d70f83..072192e47 100644
--- a/src/plugins/litehtml_viewer/container_linux_images.cpp
+++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
@@ -110,8 +110,15 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
 			if (pixbuf != NULL)
 				m_images.insert(std::make_pair(src, std::make_pair(pixbuf, last)));
 
+			unlock_images_cache();
 			return;
 		} else {
+			if (!lh_prefs_get()->enable_remote_content) {
+				debug_print("blocking download of image from '%s'\n", src);
+				unlock_images_cache();
+				return;
+			}
+
 			request = true;
 			m_images.insert(std::make_pair(url, std::make_pair((GdkPixbuf *)NULL, last)));
 		}
@@ -125,11 +132,6 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
 	if (request) {
 		struct FetchCtx *ctx;
 
-		if (!lh_prefs_get()->enable_remote_content) {
-			debug_print("blocking download of image from '%s'\n", src);
-			return;
-		}
-
 		debug_print("allowing download of image from '%s'\n", src);
 
 		ctx = g_new(struct FetchCtx, 1);

commit 9674154cb67aa8c9fe672a285730233ab7df68d8
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Thu Jul 29 17:26:33 2021 -0700

    Set hexpand on toolbars
    
    Depending on the Windows version and theme, a non-horizontally expanded
    toolbar has a sharp visual discontinuity between the toolbar button
    backgrounds and the background next to the toolbar.
    
    Enabling horizontal expansion gives a seamless background across the width
    of the window.

diff --git a/src/toolbar.c b/src/toolbar.c
index 682b7b964..c2fe7de0c 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -2262,6 +2262,7 @@ Toolbar *toolbar_create(ToolbarType 	 type,
 
 	gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
 	gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
+	gtk_widget_set_hexpand(toolbar, TRUE);
 	
 	for (cur = toolbar_list; cur != NULL; cur = cur->next) {
 

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


hooks/post-receive
-- 
Claws Mail