Attachment 144948 Details for Bug 110893 – Upstream patch against evolution-2.8.0-7.fc6.src

[patch] Upstream patch against evolution-2.8.0-7.fc6.src

resent-date.patch (text/plain), 3.42 KB, created by Baris Cicek on 2007-01-06 00:21:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Baris Cicek

Created: 2007-01-06 00:21:57 UTC

Size: 3.42 KB

patch

obsolete

>Common subdirectories: evolution-2.8.0/mail/default and evolution-2.8.0-mod/mail/default
>Only in evolution-2.8.0-mod/mail/: .deps
>Only in evolution-2.8.0-mod/mail/: evolution-mail-2.8.schemas
>Common subdirectories: evolution-2.8.0/mail/importers and evolution-2.8.0-mod/mail/importers
>diff -u evolution-2.8.0/mail/mail-ops.c evolution-2.8.0-mod/mail/mail-ops.c
>--- evolution-2.8.0/mail/mail-ops.c	2006-09-02 09:43:04.000000000 +0300
>+++ evolution-2.8.0-mod/mail/mail-ops.c	2007-01-06 01:54:09.000000000 +0200
>@@ -531,8 +531,9 @@
> 	/* Now check for posting, failures are ignored */
> 	info = camel_message_info_new(NULL);
> 	camel_message_info_set_flags(info, CAMEL_MESSAGE_SEEN, ~0);
>-	camel_mime_message_set_date(message, CAMEL_MESSAGE_DATE_CURRENT, 0);
>-
>+	if (!resent_from) {
>+		camel_mime_message_set_date(message, CAMEL_MESSAGE_DATE_CURRENT, 0);
>+	}
> 	for (header = xev;header;header=header->next) {
> 		char *uri;
> 
>@@ -866,8 +867,9 @@
> append_mail_append (struct _mail_msg *mm)
> {
> 	struct _append_msg *m = (struct _append_msg *)mm;
>-
>-	camel_mime_message_set_date(m->message, CAMEL_MESSAGE_DATE_CURRENT, 0);
>+	if (!camel_medium_get_header (CAMEL_MEDIUM (m->message), "Resent-From")) {
>+		camel_mime_message_set_date(m->message, CAMEL_MESSAGE_DATE_CURRENT, 0);
>+	}
> 	camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &mm->ex);
> }
> 
>Only in evolution-2.8.0-mod/mail/: Makefile
>Only in evolution-2.8.0-mod/composer: .deps
>diff -u evolution-2.8.0/composer/e-msg-composer-hdrs.c evolution-2.8.0-mod/composer/e-msg-composer-hdrs.c
>--- evolution-2.8.0/composer/e-msg-composer-hdrs.c	2006-07-22 14:14:51.000000000 +0300
>+++ evolution-2.8.0-mod/composer/e-msg-composer-hdrs.c	2007-01-06 01:39:52.000000000 +0200
>@@ -1065,10 +1067,10 @@
> 	
> 	subject = e_msg_composer_hdrs_get_subject (hdrs);
> 	camel_mime_message_set_subject (msg, subject);
>
> 	addr = e_msg_composer_hdrs_get_from (hdrs);
> 	if (redirect) {
> 		header = camel_address_encode (CAMEL_ADDRESS (addr));
>+		e_msg_composer_hdrs_set_resent_date (msg);
> 		camel_medium_set_header (CAMEL_MEDIUM (msg), "Resent-From", header);
> 		g_free (header);
> 	} else {
>@@ -1600,6 +1602,35 @@
> 	return gtk_entry_get_text ((GtkEntry *) hdrs->priv->subject.entry);
> }
> 
>+
>+void
>+e_msg_composer_hdrs_set_resent_date (CamelMimeMessage *message)
>+{
>+	char *datestr;
>+	time_t date;
>+	int offset;
>+	struct tm local;
>+	int tz;
>+		
>+	g_assert(message);
>+	date = time(0);
>+	e_localtime_with_offset(date, &local, &tz);
>+	offset = (((tz/60/60) * 100) + (tz/60 % 60));
>+	
>+	message->date = date;
>+	message->date_offset = offset;
>+	
>+	datestr = camel_header_format_date (date, offset);
>+	camel_medium_set_header(CAMEL_MEDIUM(message), "Resent-Date", datestr);
>+	g_free (datestr);
>+}
>+
> 
> GtkWidget *
> e_msg_composer_hdrs_get_reply_to_entry (EMsgComposerHdrs *hdrs)
>diff -u evolution-2.8.0/composer/e-msg-composer-hdrs.h evolution-2.8.0-mod/composer/e-msg-composer-hdrs.h
>--- evolution-2.8.0/composer/e-msg-composer-hdrs.h	2006-01-06 08:40:44.000000000 +0200
>+++ evolution-2.8.0-mod/composer/e-msg-composer-hdrs.h	2007-01-06 01:41:54.000000000 +0200
>@@ -146,6 +146,8 @@
> 						    int visible_mask);
> void        e_msg_composer_hdrs_set_visible        (EMsgComposerHdrs *hdrs,
> 						    int visible_flags);
>+							
>+void e_msg_composer_hdrs_set_resent_date (CamelMimeMessage *message);
> 
> #ifdef _cplusplus
> }
>Only in evolution-2.8.0-mod/composer: log.txt
>Only in evolution-2.8.0-mod/composer: Makefile
>Only in evolution-2.8.0-mod/composer: tags

Actions: View | Diff

Attachments on bug 110893: 144948