CVS: sylpheedclaws/plugins/vcalendar/src vcal_manager.c,1.1.2.45,1.1.2.46

Update of /pack/anoncvs/sylpheedclaws/plugins/vcalendar/src
In directory sunsite.dk:/tmp/cvs-serv23940/src

Modified Files:
      Tag: gtk2
	vcal_manager.c 
Log Message:
2006-12-06 [colin]	1.91.0cvs2

	* src/vcal_manager.c
		Fix double encoding of subject

Index: vcal_manager.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/plugins/vcalendar/src/vcal_manager.c,v
retrieving revision 1.1.2.45
retrieving revision 1.1.2.46
diff -u -d -r1.1.2.45 -r1.1.2.46
--- vcal_manager.c	2006/12/06 08:20:19	1.1.2.45
+++ vcal_manager.c	2006/12/06 21:29:32	1.1.2.46
@@ -555,7 +555,7 @@
 	get_rfc822_date_from_time_t(date, sizeof(date), t);
 
 	conv_encode_header(subject, 511, t_subject, strlen("Subject: "), FALSE);
-					
+				
 	return g_strdup_printf("From: -\n"
 				"To: -\n"
 				"Subject: %s\n"
@@ -1094,7 +1094,7 @@
 			    gboolean 		 is_reply, 
 			    gboolean 		 is_pseudo_display)
 {
-	gchar subject[512];
+	gchar *subject = NULL;
 	gchar date[128];
 	gchar *save_folder = NULL;
 	gchar *result = NULL;
@@ -1105,10 +1105,8 @@
 	gchar *prefix = NULL;
 	gchar enc_subject[512], enc_prefix[512], enc_from[512], *from = NULL;
 	gchar msgid[128];	
-	memset(subject, 0, sizeof(subject));
-	memset(date, 0, sizeof(date));
 
-	conv_encode_header(subject, 511, event->summary, strlen("Subject: "), FALSE);
+	memset(date, 0, sizeof(date));
 	
 	if (is_pseudo_display) {
 		struct icaltimetype itt = (icaltime_from_string(event->dtstart));
@@ -1179,8 +1177,8 @@
 	else
 		method_str = "REQUEST";		
 	
-	conv_encode_header_full(enc_prefix, sizeof(enc_prefix), prefix, strlen("Subject: "), 
-			FALSE, conv_get_outgoing_charset_str());
+	subject = g_strdup_printf("%s%s", prefix, event->summary);
+
 	conv_encode_header_full(enc_subject, sizeof(enc_subject), subject, strlen("Subject: "), 
 			FALSE, conv_get_outgoing_charset_str());
 	from = is_reply?account->name:(event->orgname?event->orgname:"");
@@ -1191,7 +1189,7 @@
 	result = g_strdup_printf("%s"
 				"From: %s <%s>\n"
 				"To: <%s>\n"
-				"Subject: %s%s\n"
+				"Subject: %s\n"
 				"Date: %s\n"
 				"MIME-Version: 1.0\n"
 				"Content-Type: text/calendar; method=%s; charset=\"%s\"\n"
@@ -1201,7 +1199,6 @@
 				enc_from,
 				is_reply ? account->address:event->organizer,
 				is_reply ? event->organizer:(attendees?attendees:event->organizer),
-				enc_prefix,
 				enc_subject,
 				date,
 				method_str,
@@ -1211,6 +1208,7 @@
 				is_pseudo_display?
 					event_to_today_str(event, 0):msgid);
 	
+	g_free(subject);
 	g_free(save_folder);
 	g_free(queue_headers);
 	g_free(attendees);