talons

commit e4178b9380e43318b07b3ddf163ddc13f7e7ad11
parent 1fcddc03040d954d5fee040c8c2443d22e753416
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  7 Jun 2014 21:15:44 +0200

Fancy Coverity fixes

Diffstat:
M
src/plugins/fancy/fancy_viewer.c
 | 
18
++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
@@ -212,7 +212,11 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
 					: NULL;
 	MimeInfo *partinfo = viewer->to_load;
 
-	messageview->updating = TRUE;
+	if (messageview) {
+		messageview->updating = TRUE;
+		NoticeView *noticeview = messageview->noticeview;
+		noticeview_hide(noticeview);
+	}
 
 	if (viewer->filename != NULL) {
 		g_unlink(viewer->filename);
@@ -220,10 +224,6 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
 		viewer->filename = NULL;
 	}
 
-	if (messageview) {
-		NoticeView *noticeview = messageview->noticeview;
-		noticeview_hide(noticeview);
-	}
 	if (partinfo)
 		viewer->filename = procmime_get_tmp_file_name(partinfo);
 	debug_print("filename: %s\n", viewer->filename);
@@ -236,8 +236,7 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
 	}
 	else {
 		const gchar *charset = NULL;
-		if (_viewer && _viewer->mimeview &&
-			_viewer->mimeview->messageview->forced_charset)
+		if (messageview && messageview->forced_charset)
 			charset = _viewer->mimeview->messageview->forced_charset;
 		else
 			charset = procmime_mimeinfo_get_parameter(partinfo, "charset");
@@ -1015,7 +1014,10 @@ gint plugin_init(gchar **error)
 	gchar *directory = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
 				"fancy", NULL);
 	if (!is_dir_exist(directory))
-		make_dir (directory);
+		if (make_dir (directory) < 0) {
+			g_free(directory);
+			return -1;
+		}
 	g_free(directory);
 
 	fancy_prefs_init();