[Commits] [SCM] claws branch, litehtml, updated. 3.17.0-172-g4382421

miras at claws-mail.org miras at claws-mail.org
Thu Nov 15 23:06:35 CET 2018


The branch, litehtml has been updated
       via  43824215231eed9e63a569094906528fcce8b3f3 (commit)
      from  9b84a6b6f4ec374ec211dfd11a027d6387f41a44 (commit)

Summary of changes:
 src/plugins/litehtml_viewer/http.cpp      |    2 +-
 src/plugins/litehtml_viewer/lh_widget.cpp |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 43824215231eed9e63a569094906528fcce8b3f3
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Nov 15 23:06:29 2018 +0100

    Do not use G_LOG_LEVEL_ERROR. Makes claws crash
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/litehtml_viewer/http.cpp b/src/plugins/litehtml_viewer/http.cpp
index 3cfa36e..e6547eb 100644
--- a/src/plugins/litehtml_viewer/http.cpp
+++ b/src/plugins/litehtml_viewer/http.cpp
@@ -30,7 +30,7 @@ size_t http::curl_write_data(char* ptr, size_t size, size_t nmemb, void* data_pt
     char *input = (char *) g_realloc(data->memory, data->size + realsize + 1);
     if(input == NULL) {
         /* out of memory! */
-        g_log(NULL, G_LOG_LEVEL_ERROR, "not enough memory (realloc returned NULL)");
+        g_log(NULL, G_LOG_LEVEL_WARNING, "not enough memory (realloc returned NULL)");
         return 0;
     }
     
diff --git a/src/plugins/litehtml_viewer/lh_widget.cpp b/src/plugins/litehtml_viewer/lh_widget.cpp
index 432a169..ec96a16 100644
--- a/src/plugins/litehtml_viewer/lh_widget.cpp
+++ b/src/plugins/litehtml_viewer/lh_widget.cpp
@@ -150,14 +150,14 @@ GdkPixbuf *lh_widget::get_image(const litehtml::tchar_t* url, bool redraw_on_rea
 
 	g_log(NULL, G_LOG_LEVEL_MESSAGE, "Loading... %s", url);
 
-    http http_loader;
-    GInputStream *image = http_loader.load_url(url, &error);
+	http http_loader;
+	GInputStream *image = http_loader.load_url(url, &error);
     
 	if (!image) return NULL;
 	
 	pixbuf = gdk_pixbuf_new_from_stream(image, NULL, &error);
 	if (error) {
-	    g_log(NULL, G_LOG_LEVEL_ERROR, "lh_widget::get_image: Could not create pixbuf %s", error->message);
+	    g_log(NULL, G_LOG_LEVEL_WARNING, "lh_widget::get_image: Could not create pixbuf %s", error->message);
 	    //g_object_unref(pixbuf);
 	    pixbuf = NULL;
 	    g_clear_error(&error);
@@ -403,7 +403,7 @@ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
 			     w->m_clicked_url.c_str(),
 			     GDK_CURRENT_TIME, &error);
                 if (error) {
-                    g_log(NULL, G_LOG_LEVEL_ERROR, "Failed opening url(%s): %s", w->m_clicked_url, error->message);
+                    g_log(NULL, G_LOG_LEVEL_WARNING, "Failed opening url(%s): %s", w->m_clicked_url, error->message);
                     g_clear_error(&error);
                 }
         }

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list