g_return_if_fail(compose != NULL);
g_return_if_fail(account != NULL);
+/* if (!item->prefs->do_not_sign_or_encrypt)*/
+ {
if (override_pref == FALSE && account->default_encrypt_reply == FALSE)
return;
privacy = (gchar *)(privacy_avail->data);
}
}
+ }
if (privacy != NULL) {
compose->privacy_system = g_strdup(privacy);
compose_update_privacy_system_menu_item(compose, FALSE);
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- if (compose_put_existing_to_front(msginfo))
+ if (compose_put_existing_to_front(msginfo)) {
return;
+ }
if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
param = atoi(&queueheader_buf[strlen("X-Priority: ")]); /* mind the space */
compose->priority = param;
}
- } else
+ } else {
account = msginfo->folder->folder->account;
+ }
if (!account && prefs_common.reedit_account_autosel) {
gchar from[BUFFSIZE];
- if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
+ if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")) {
extract_address(from);
account = account_find_from_address(from);
}
}
- if (!account) account = cur_account;
+ if (!account) {
+ account = cur_account;
+ }
g_return_if_fail(account != NULL);
compose = compose_create(account, COMPOSE_REEDIT, FALSE);
if (compose->deferred_destroy) {
compose_destroy(compose);
- return NULL;
+ return;
}
compose_extract_original_charset(compose);
}
}
- if (compose_parse_header(compose, msginfo) < 0) return;
+ if (compose_parse_header(compose, msginfo) < 0) {
+ return;
+ }
compose_reedit_set_entry(compose, msginfo);
textview = GTK_TEXT_VIEW(compose->text);
if (procmime_msginfo_is_encrypted(msginfo)) {
fp = procmime_get_first_encrypted_text_content(msginfo);
- if (fp)
+ if (fp) {
compose_force_encryption(compose, account, TRUE);
- } else
+ }
+ } else {
fp = procmime_get_first_text_content(msginfo);
- if (fp == NULL)
+ }
+ if (fp == NULL) {
g_warning("Can't get text part\n");
+ }
if (fp != NULL) {
gboolean prev_autowrap = compose->autowrap;
gtk_widget_grab_focus(compose->text);
- if (prefs_common.auto_exteditor)
+ if (prefs_common.auto_exteditor) {
compose_exec_ext_editor(compose);
+ }
compose->modified = FALSE;
compose_set_title(compose);
}