talons

commit 5fe6b16b533e148a4e36ac51eaa972bbcd48496f
parent a6ece75c6330d9b9f2fe486e205d77c4e186fefa
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Fri,  1 Mar 2019 15:05:58 +0100

Simplify vcalviewer_get_uid_from_mimeinfo()

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

1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
@@ -647,27 +647,13 @@ void vcalviewer_display_event (VCalViewer *vcalviewer, VCalEvent *event)
 
 gchar *vcalviewer_get_uid_from_mimeinfo(MimeInfo *mimeinfo)
 {
-	gchar *tmpfile = procmime_get_tmp_file_name(mimeinfo);
-	const gchar *charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
 	gchar *compstr = NULL;
 	gchar *res = NULL;
 	VCalEvent *event = NULL;
 
-	if (procmime_get_part(tmpfile, mimeinfo) < 0) {
-		g_warning("Can't get mimepart file");	
-		g_free(tmpfile);
-		return NULL;
-	}
-	
-	if (!charset)
-		charset = CS_WINDOWS_1252;
-
-	if (!strcasecmp(charset, CS_ISO_8859_1))
-		charset = CS_WINDOWS_1252;
-
-	compstr = file_read_to_str(tmpfile);
+	compstr = procmime_get_part_as_string(mimeinfo);
 	
-	event = vcal_get_event_from_ical(compstr, charset);
+	event = vcal_get_event_from_ical(compstr, NULL);
 	if (event)
 		res = g_strdup(event->uid);