/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#define COMPOSE_DRAFT_TIMEOUT_UNSET -1
#define COMPOSE_DRAFT_TIMEOUT_FORBIDDEN -2
+#define COMPOSE_PRIVACY_WARNING() { \
+ alertpanel_error(_("You have opted to sign and/or encrypt this " \
+ "message but have not selected a privacy system.\n\n" \
+ "Signing and encrypting have been disabled for this " \
+ "message.")); \
+}
+
static GdkColor default_header_bgcolor = {
(gulong)0,
(gushort)0,
if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
(account->default_encrypt || account->default_sign))
- alertpanel_error(_("You have opted to sign and/or encrypt this "
- "message but have not selected a privacy system.\n\n"
- "Signing and encrypting have been disabled for this "
- "message."));
+ COMPOSE_PRIVACY_WARNING();
/* override from name if mailto asked for it */
if (mailto_from) {
g_free(s_system);
if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
- ((account->default_encrypt_reply && MSG_IS_ENCRYPTED(compose->replyinfo->flags)) ||
+ ((account->default_encrypt || account->default_sign) ||
+ (account->default_encrypt_reply && MSG_IS_ENCRYPTED(compose->replyinfo->flags)) ||
(account->default_sign_reply && MSG_IS_SIGNED(compose->replyinfo->flags))))
- alertpanel_error(_("You have opted to sign and/or encrypt this "
- "message but have not selected a privacy system.\n\n"
- "Signing and encrypting have been disabled for this "
- "message."));
+ COMPOSE_PRIVACY_WARNING();
SIGNAL_BLOCK(textbuf);
#endif
SIGNAL_UNBLOCK(textbuf);
+ if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
+ (account->default_encrypt || account->default_sign))
+ COMPOSE_PRIVACY_WARNING();
+
cursor_pos = quote_fmt_get_cursor_pos();
if (cursor_pos == -1)
gtk_widget_grab_focus(compose->header_last->entry);
compose = compose_create(account, ((MsgInfo *)msginfo_list->data)->folder, COMPOSE_FORWARD, FALSE);
compose_apply_folder_privacy_settings(compose, ((MsgInfo *)msginfo_list->data)->folder);
+ if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
+ (account->default_encrypt || account->default_sign))
+ COMPOSE_PRIVACY_WARNING();
compose->updating = TRUE;
compose_activate_privacy_system(compose, account, FALSE);
}
compose_apply_folder_privacy_settings(compose, msginfo->folder);
+ if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
+ (account->default_encrypt || account->default_sign))
+ COMPOSE_PRIVACY_WARNING();
compose->targetinfo = procmsg_msginfo_copy(msginfo);
compose->targetinfo->tags = g_slist_copy(msginfo->tags);
cm_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, msginfo->folder, COMPOSE_REDIRECT, batch);
- compose_apply_folder_privacy_settings(compose, msginfo->folder);
compose->updating = TRUE;
gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
if (compose->toolbar->linewrap_all_btn)
gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+ if (compose->toolbar->privacy_sign_btn)
+ gtk_widget_set_sensitive(compose->toolbar->privacy_sign_btn, FALSE);
+ if (compose->toolbar->privacy_encrypt_btn)
+ gtk_widget_set_sensitive(compose->toolbar->privacy_encrypt_btn, FALSE);
compose->modified = FALSE;
compose_set_title(compose);
cm_return_val_if_fail(msginfo != NULL, -1);
- if ((fp = procmsg_open_message(msginfo)) == NULL) return -1;
+ if ((fp = procmsg_open_message(msginfo, FALSE)) == NULL) return -1;
procheader_get_header_fields(fp, hentry);
claws_fclose(fp);
cm_return_val_if_fail(msginfo != NULL, -1);
- if ((fp = procmsg_open_message(msginfo)) == NULL) return -1;
+ if ((fp = procmsg_open_message(msginfo, FALSE)) == NULL) return -1;
procheader_get_header_fields(fp, entries);
claws_fclose(fp);
for (; *p != '\0' && i < len; i++) {
PangoLogAttr *attr = attrs + i;
- gunichar wc;
+ gunichar wc = g_utf8_get_char(p);
gint uri_len;
- if (attr->is_line_break && can_break && was_white && !prev_dont_break)
+ /* attr->is_line_break will be false for some characters that
+ * we want to break a line before, like '/' or ':', so we
+ * also allow breaking on any non-wide character. The
+ * mentioned pango attribute is still useful to decide on
+ * line breaks when wide characters are involved. */
+ if ((!g_unichar_iswide(wc) || attr->is_line_break)
+ && can_break && was_white && !prev_dont_break)
pos = i;
was_white = attr->is_white;
continue;
}
- wc = g_utf8_get_char(p);
if (g_unichar_iswide(wc)) {
col += 2;
if (prev_dont_break && can_break && attr->is_line_break)
alertpanel_error(_("Could not queue message for sending:\n\n"
"Couldn't get recipient encryption key."));
break;
+ case COMPOSE_QUEUE_SIGNING_CANCELLED:
+ debug_print("signing cancelled\n");
+ break;
default:
/* unhandled error */
debug_print("oops, unhandled compose_queue() return value %d\n",
compose->account, from_addr)) {
g_free(from_name);
g_free(from_addr);
- return COMPOSE_QUEUE_ERROR_SIGNING_FAILED;
+ if (!privacy_peek_error())
+ return COMPOSE_QUEUE_SIGNING_CANCELLED;
+ else
+ return COMPOSE_QUEUE_ERROR_SIGNING_FAILED;
}
g_free(from_name);
g_free(from_addr);
if (mimepart->type == MIMETYPE_MESSAGE
|| mimepart->type == MIMETYPE_MULTIPART)
ainfo->encoding = ENC_BINARY;
- else if (compose->use_signing) {
+ else if (compose->use_signing || compose->fwdinfo != NULL) {
if (ainfo->encoding == ENC_7BIT)
ainfo->encoding = ENC_QUOTED_PRINTABLE;
else if (ainfo->encoding == ENC_8BIT)
gtk_container_set_border_width(GTK_CONTAINER(window), 8);
gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(attach_property_delete_event),
cancelled);
}
static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
- gboolean wrap, GdkAtom clip, GtkTextIter *insert_place)
+ gboolean wrap, GdkAtom clip, GtkTextIter *insert_place)
{
- if (GTK_IS_TEXT_VIEW(entry)) {
+ if (GTK_IS_TEXT_VIEW(entry)) {
GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
GtkTextMark *mark_start = gtk_text_buffer_get_insert(buffer);
GtkTextIter start_iter, end_iter;
gint start, end;
gchar *contents = gtk_clipboard_wait_for_text(gtk_clipboard_get(clip));
-
+
if (contents == NULL)
return;
gtk_text_buffer_insert(buffer, insert_place, contents, strlen(contents));
if (prefs_common.primary_paste_unselects)
gtk_text_buffer_select_range(buffer, insert_place, insert_place);
- }
+ }
if (!wrap) {
/* paste unwrapped: mark the paste so it's not wrapped later */
gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
gtk_text_iter_backward_char(&start_iter);
compose_beautify_paragraph(compose, &start_iter, TRUE);
- }
+ }
} else if (GTK_IS_EDITABLE(entry))
gtk_editable_paste_clipboard (GTK_EDITABLE(entry));
-
+
compose->modified = TRUE;
}
-
+
static void entry_allsel(GtkWidget *entry)
{
if (GTK_IS_EDITABLE(entry))
projects / claws.git / blobdiff