talons

commit 80108ed0f1bd1d9df477cef5336e90d660dbc67e
parent bcde37e89350aa6992e1bc2430d1b4f84165a0b4
Author: Colin Leroy <colin@colino.net>
Date:   Sun,  7 Jul 2019 10:31:01 +0200

procmime_get_part_as_inputstream doesn't touch error, so remove it

Diffstat:
M
src/image_viewer.c
 | 
7
+++----
M
src/plugins/litehtml_viewer/lh_widget.cpp
 | 
11
+++--------
M
src/procmime.c
 | 
3
+--
M
src/procmime.h
 | 
3
+--
M
src/textview.c
 | 
7
+++----

5 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/image_viewer.c b/src/image_viewer.c
@@ -81,10 +81,9 @@ static void image_viewer_load_image(ImageViewer *imageviewer)
 	if (imageviewer->mimeinfo == NULL)
 		return;
 
-	stream = procmime_get_part_as_inputstream(imageviewer->mimeinfo, &error);
-	if (error != NULL) {
-		g_warning("Couldn't get image MIME part: %s\n", error->message);
-		g_error_free(error);
+	stream = procmime_get_part_as_inputstream(imageviewer->mimeinfo);
+	if (stream == NULL) {
+		g_warning("Couldn't get image MIME part");
 		return;
 	}
 
diff --git a/src/plugins/litehtml_viewer/lh_widget.cpp b/src/plugins/litehtml_viewer/lh_widget.cpp
@@ -482,14 +482,9 @@ GdkPixbuf *lh_widget::get_local_image(const litehtml::tstring url) const
 			GInputStream *stream;
 			GError *error = NULL;
 
-			stream = procmime_get_part_as_inputstream(p, &error);
-			if (error != NULL || stream == NULL) {
-				if (error != NULL) {
-					g_warning("Couldn't get image MIME part: %s\n", error->message);
-					g_error_free(error);
-				} else {
-					g_warning("Could not decode MIME part\n");
-				}
+			stream = procmime_get_part_as_inputstream(p);
+			if (stream == NULL) {
+				g_warning("Could not decode MIME part\n");
 				return NULL;
 			}
 
diff --git a/src/procmime.c b/src/procmime.c
@@ -2758,8 +2758,7 @@ void *procmime_get_part_as_string(MimeInfo *mimeinfo,
 
 /* Returns an open GInputStream. The caller should just
  * read mimeinfo->length bytes from it and then release it. */
-GInputStream *procmime_get_part_as_inputstream(MimeInfo *mimeinfo,
-		GError **error)
+GInputStream *procmime_get_part_as_inputstream(MimeInfo *mimeinfo)
 {
 	cm_return_val_if_fail(mimeinfo != NULL, NULL);
 
diff --git a/src/procmime.h b/src/procmime.h
@@ -243,8 +243,7 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
 		gpointer cb_data);
 void *procmime_get_part_as_string(MimeInfo *mimeinfo,
 		gboolean null_terminate);
-GInputStream *procmime_get_part_as_inputstream(MimeInfo *mimeinfo,
-		GError **error);
+GInputStream *procmime_get_part_as_inputstream(MimeInfo *mimeinfo);
 
 #ifdef __cplusplus
 }
diff --git a/src/textview.c b/src/textview.c
@@ -685,10 +685,9 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
 			START_TIMING("inserting image");
 
-			stream = procmime_get_part_as_inputstream(mimeinfo, &error);
-			if (error != NULL) {
-				g_warning("Can't get the image file: %s", error->message);
-				g_error_free(error);
+			stream = procmime_get_part_as_inputstream(mimeinfo);
+			if (stream == NULL) {
+				g_warning("Can't get the image file");
 				END_TIMING();
 				return;
 			}