{N_("/_Message/Priority/_Lowest"), NULL, compose_set_priority_cb, PRIORITY_LOWEST, "/Message/Priority/Highest"},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
- {N_("/_Message/_Create new thread"), NULL, compose_toggle_new_thread_cb, 0, "<ToggleItem>"},
+ {N_("/_Message/_Remove references"), NULL, compose_toggle_new_thread_cb, 0, "<ToggleItem>"},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
{N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
compose = compose_create(account, COMPOSE_REPLY);
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_toggle(ifactory, "/Message/Create new thread", TRUE);
+
+ menu_set_toggle(ifactory, "/Message/Remove references", FALSE);
compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
if (!compose->replyinfo)
if (msginfo->folder && msginfo->folder->ret_rcpt)
menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
-
/* Set save folder */
if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
gchar *folderidentifier;
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
-
-
}
#define INSERT_FW_HEADER(var, hdr) \
compose_attach_parts(compose, msginfo);
- if (msginfo->subject) {
- if (compose->original_subject)
- g_free(compose->original_subject);
-
- compose->original_subject = g_strdup(msginfo->subject);
-
+ if (msginfo->subject)
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
msginfo->subject);
- }
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
gtk_stext_freeze(GTK_STEXT(compose->text));
compose_entry_append(compose, cc, COMPOSE_CC);
if (bcc)
compose_entry_append(compose, bcc, COMPOSE_BCC);
- if (subject) {
- if (compose->original_subject)
- g_free(compose->original_subject);
-
- compose->original_subject = g_strdup(subject);
-
+ if (subject)
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
- }
if (body) {
gtk_stext_insert(GTK_STEXT(compose->text),
NULL, NULL, NULL, body, -1);
buf2 = g_strdup_printf("Re: %s", buf);
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf2);
- if (compose->original_subject)
- g_free(compose->original_subject);
-
- compose->original_subject = g_strdup(buf2);
-
g_free(buf2);
g_free(buf);
} else
compose->msgid = g_strdup(buf);
}
- if (compose->remove_references == TRUE) {
- gchar *subj;
-
- subj = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
-
- if (compose->original_subject != NULL &&
- strcmp(subj, compose->original_subject)) {
- g_free(compose->inreplyto);
- g_free(compose->references);
-
- compose->inreplyto = NULL;
- compose->references = NULL;
- }
- }
-
- /* In-Reply-To */
- if (compose->inreplyto && compose->to_list)
- fprintf(fp, "In-Reply-To: <%s>\n", compose->inreplyto);
+ if (compose->remove_references == FALSE) {
+ /* In-Reply-To */
+ if (compose->inreplyto && compose->to_list)
+ fprintf(fp, "In-Reply-To: <%s>\n", compose->inreplyto);
- /* References */
- if (compose->references)
- fprintf(fp, "References: %s\n", compose->references);
+ /* References */
+ if (compose->references)
+ fprintf(fp, "References: %s\n", compose->references);
+ }
/* Followup-To */
compose_write_headers_from_headerlist(compose, fp, "Followup-To");
procmsg_msginfo_free(compose->replyinfo);
procmsg_msginfo_free(compose->fwdinfo);
- g_free(compose->original_subject);
-
g_free(compose->replyto);
g_free(compose->cc);
g_free(compose->bcc);