PRIORITY_LOWEST
} PriorityLevel;
+#if USE_GPGME
+typedef enum
+{
+ SIG_MODE_DETACH,
+ SIG_MODE_CLEAR
+} ComposeSigMode;
+
+typedef enum
+{
+ ENC_MODE_DETACH,
+ ENC_MODE_ASCII
+} ComposeEncMode;
+#endif
+
#define B64_LINE_SIZE 57
#define B64_BUFFSIZE 77
static void compose_toggle_encrypt_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void compose_set_sigmode_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
+static void compose_set_encmode_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
+static void compose_update_sigmode_menu_item(Compose * compose);
+static void compose_update_encmode_menu_item(Compose * compose);
+static void activate_gnupg_mode (Compose *compose,
+ PrefsAccount *account);
#endif
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget);
#if USE_GPGME
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
+ {N_("/_Message/Sign mode"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Message/Sign mode/MIME"), NULL, compose_set_sigmode_cb, SIG_MODE_DETACH, "<RadioItem>"},
+ {N_("/_Message/Sign mode/Clear"),NULL, compose_set_sigmode_cb, SIG_MODE_CLEAR, "/Message/Sign mode/MIME"},
{N_("/_Message/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
+ {N_("/_Message/Encrypt mode"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Message/Encrypt mode/MIME"), NULL, compose_set_encmode_cb, ENC_MODE_DETACH, "<RadioItem>"},
+ {N_("/_Message/Encrypt mode/ASCII"),NULL, compose_set_encmode_cb, ENC_MODE_ASCII, "/Message/Encrypt mode/MIME"},
#endif /* USE_GPGME */
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Priority"), NULL, NULL, 0, "<Branch>"},
return compose;
}
-#define CHANGE_FLAGS(msginfo) \
-{ \
-if (msginfo->folder->folder->change_flags != NULL) \
-msginfo->folder->folder->change_flags(msginfo->folder->folder, \
- msginfo->folder, \
- msginfo); \
-}
-
/*
Compose *compose_new_followup_and_replyto(PrefsAccount *account,
const gchar *followupto, gchar * to)
gboolean as_attach, const gchar *body)
{
Compose *compose;
- /* PrefsAccount *account; */
GtkSText *text;
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
- account = msginfo->folder->folder->account;
+ if (!account)
+ account = msginfo->folder->folder->account;
if (!account && msginfo->to && prefs_common.forward_account_autosel) {
gchar *to;
Xstrdup_a(to, msginfo->to, return NULL);
MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
if (MSG_IS_IMAP(msginfo->flags))
imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
- CHANGE_FLAGS(msginfo);
compose = compose_create(account, COMPOSE_FORWARD);
else
qmark = "> ";
- quote_str = compose_quote_fmt(compose, msginfo,
+ quote_str = compose_quote_fmt(compose, full_msginfo,
prefs_common.fw_quotefmt,
qmark, body);
compose_attach_parts(compose, msginfo);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
MSG_UNSET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_REPLIED);
MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
- CHANGE_FLAGS(((MsgInfo *)msginfo->data));
}
compose = compose_create(account, COMPOSE_FORWARD);
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- if (msginfo->folder->stype == F_QUEUE) {
+ if (msginfo->folder->stype == F_QUEUE || msginfo->folder->stype == F_DRAFT) {
gchar queueheader_buf[BUFFSIZE];
gint id;
if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning(_("Can't get text part\n"));
else {
- while (fgets(buf, sizeof(buf), fp) != NULL)
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ strcrchomp(buf);
gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ }
fclose(fp);
}
compose_attach_parts(compose, msginfo);
#if USE_GPGME
menu_set_sensitive(ifactory, "/Message/Sign", FALSE);
menu_set_sensitive(ifactory, "/Message/Encrypt", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Sign mode/", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Encrypt mode/", FALSE);
#endif
menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
hentry[H_LIST_POST].body = NULL;
}
+ /* CLAWS - X-Priority */
if (compose->mode == COMPOSE_REEDIT)
if (hentry[H_X_PRIORITY].body != NULL) {
gint priority;
g_return_if_fail(compose->account != NULL);
g_return_if_fail(msginfo != NULL);
- if (to_ml && compose->ml_post) {
- compose_entry_append(compose, compose->ml_post,
- COMPOSE_TO);
- } else if ((compose->account->protocol != A_NNTP) || followup_and_reply_to) {
- if (!(to_all || ignore_replyto)
- && msginfo->folder
- && msginfo->folder->prefs->enable_default_reply_to) {
+ if (compose->account->protocol != A_NNTP || followup_and_reply_to) {
+ if (!compose->replyto && to_ml && compose->ml_post)
+ compose_entry_append(compose,
+ compose->ml_post,
+ COMPOSE_TO);
+ else if (!(to_all || ignore_replyto)
+ && msginfo->folder
+ && msginfo->folder->prefs->enable_default_reply_to) {
compose_entry_append(compose,
msginfo->folder->prefs->default_reply_to,
COMPOSE_TO);
} else
compose_entry_append(compose,
- ((compose->replyto && !ignore_replyto)
- ? compose->replyto
- : msginfo->from ? msginfo->from : ""),
- COMPOSE_TO);
+ (compose->replyto && !ignore_replyto)
+ ? compose->replyto
+ : msginfo->from ? msginfo->from : "",
+ COMPOSE_TO);
} else {
if (ignore_replyto)
compose_entry_append
(compose, msginfo->from ? msginfo->from : "",
COMPOSE_TO);
else {
- if (compose->followup_to && !strncmp(compose->followup_to,"poster",6)) {
+ if (compose->followup_to && !strncmp(compose->followup_to, "poster", 6)) {
compose_entry_append
(compose,
((compose->replyto && !ignore_replyto)
SET_ADDRESS(COMPOSE_REPLYTO, compose->replyto);
compose_update_priority_menu_item(compose);
-
+#if USE_GPGME
+ compose_update_sigmode_menu_item(compose);
+ compose_update_encmode_menu_item(compose);
+#endif
compose_show_first_last_header(compose, TRUE);
#if 0 /* NEW COMPOSE GUI */
menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
account->default_encrypt);
+
+ activate_gnupg_mode(compose, account);
#endif /* USE_GPGME */
}
#if USE_GPGME
if (!is_draft &&
- compose->use_signing && !compose->account->clearsign &&
+ compose->use_signing && !compose->sigmode &&
encoding == ENC_8BIT)
encoding = ENC_BASE64;
#endif
}
#if USE_GPGME
- if (!is_draft && compose->use_signing && compose->account->clearsign) {
+ if (!is_draft && compose->use_signing && compose->sigmode) {
if (compose_clearsign_text(compose, &buf) < 0) {
g_warning("clearsign failed\n");
fclose(fp);
if (is_draft)
return 0;
- if ((compose->use_signing && !compose->account->clearsign) ||
+ if ((compose->use_signing && !compose->sigmode) ||
compose->use_encryption) {
if (canonicalize_file_replace(file) < 0) {
unlink(file);
}
}
- if (compose->use_signing && !compose->account->clearsign) {
+ if (compose->use_signing && !compose->sigmode) {
GSList *key_list;
if (compose_create_signers_list(compose, &key_list) < 0 ||
}
if (compose->use_encryption) {
if (rfc2015_encrypt(file, compose->to_list,
- compose->account->ascii_armored) < 0) {
+ compose->encmode) < 0) {
unlink(file);
return -1;
}
g_return_val_if_fail(compose->account != NULL, -1);
g_return_val_if_fail(compose->account->address != NULL, -1);
- /* Save copy folder */
+ /* Save draft infos */
if (is_draft) {
+ fprintf(fp, "S:%s\n", compose->account->address);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
savefolderid = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
- fprintf(fp, "SCF:%s\n\n", savefolderid);
+ fprintf(fp, "SCF:%s\n", savefolderid);
g_free(savefolderid);
- } else {
- fprintf(fp, " \n\n");
}
+ fprintf(fp, "\n");
}
/* Date */
/* drag and drop */
gtk_drag_dest_set(attach_clist,
GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
- GDK_ACTION_COPY);
+ GDK_ACTION_COPY | GDK_ACTION_MOVE);
gtk_signal_connect(GTK_OBJECT(attach_clist), "drag_data_received",
GTK_SIGNAL_FUNC(compose_attach_drag_received_cb),
compose);
GdkColormap *cmap;
GdkColor color[1];
gboolean success[1];
- GdkFont *font;
GtkWidget *popupmenu;
GtkItemFactory *popupfactory;
GtkItemFactory *ifactory;
/* drag and drop */
gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
- GDK_ACTION_COPY);
+ GDK_ACTION_COPY | GDK_ACTION_MOVE);
gtk_signal_connect(GTK_OBJECT(text), "drag_data_received",
GTK_SIGNAL_FUNC(compose_insert_drag_received_cb),
compose);
new_style = gtk_style_copy(style);
if (prefs_common.textfont) {
- if (MB_CUR_MAX == 1) {
- gchar *fontstr, *p;
+ GdkFont *font;
- Xstrdup_a(fontstr, prefs_common.textfont, );
- if (fontstr && (p = strchr(fontstr, ',')) != NULL)
- *p = '\0';
- font = gdk_font_load(fontstr);
- } else
- font = gdk_fontset_load(prefs_common.textfont);
- if (font) {
+ if ((font = gtkut_font_load(prefs_common.textfont)) != NULL) {
gdk_font_unref(new_style->font);
new_style->font = font;
}
#if USE_ASPELL
menu_set_sensitive(ifactory, "/Spelling", FALSE);
- if (prefs_common.enable_aspell) {
+ if (prefs_common.enable_aspell &&
+ strcmp(prefs_common.dictionary, _("None"))) {
gtkaspell = gtkaspell_new((const gchar*)prefs_common.dictionary,
conv_get_current_charset_str(),
prefs_common.misspelled_col,
/* Priority */
compose->priority = PRIORITY_NORMAL;
compose_update_priority_menu_item(compose);
+
+#if USE_GPGME
+ activate_gnupg_mode(compose, account);
+#endif
set_toolbar_style(compose);
}
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
+
+#if USE_GPGME
+static void compose_set_sigmode_cb(gpointer data,
+ guint action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *) data;
+ compose->sigmode = action;
+}
+
+static void compose_update_sigmode_menu_item(Compose * compose)
+{
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem = NULL;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ switch (compose->sigmode) {
+ case SIG_MODE_DETACH:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Sign mode/MIME");
+ break;
+ case SIG_MODE_CLEAR:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Sign mode/Clear");
+ break;
+ }
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+
+ if (compose->use_signing == TRUE)
+ menu_set_sensitive(ifactory, "/Message/Sign mode", TRUE);
+ else
+ menu_set_sensitive(ifactory, "/Message/Sign mode", FALSE);
+}
+
+static void compose_set_encmode_cb(gpointer data,
+ guint action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *) data;
+ compose->encmode = action;
+}
+
+static void compose_update_encmode_menu_item(Compose * compose)
+{
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem = NULL;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ switch (compose->encmode) {
+ case ENC_MODE_DETACH:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Encrypt mode/MIME");
+ break;
+ case ENC_MODE_ASCII:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Encrypt mode/ASCII");
+ break;
+ }
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+
+ if (compose->use_encryption == TRUE)
+ menu_set_sensitive(ifactory, "/Message/Encrypt mode", TRUE);
+ else
+ menu_set_sensitive(ifactory, "/Message/Encrypt mode", FALSE);
+}
+#endif
static void compose_set_template_menu(Compose *compose)
{
tmpl->subject);
if (tmpl->to && *tmpl->to != '\0')
compose_entry_append(compose, tmpl->to, COMPOSE_TO);
+ if (tmpl->cc && *tmpl->cc != '\0')
+ compose_entry_append(compose, tmpl->cc, COMPOSE_CC);
+
+ if (tmpl->bcc && *tmpl->bcc != '\0')
+ compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
if (replace)
gtk_stext_clear(GTK_STEXT(compose->text));
if (!val) gtk_widget_destroy(compose->window);
}
+void compose_draft (gpointer data)
+{
+ compose_draft_cb(data, 0, NULL);
+}
+
static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
{
Compose *compose = (Compose *)data;
compose->use_signing = TRUE;
else
compose->use_signing = FALSE;
+
+ compose_update_sigmode_menu_item(compose);
}
static void compose_toggle_encrypt_cb(gpointer data, guint action,
compose->use_encryption = TRUE;
else
compose->use_encryption = FALSE;
+
+ compose_update_encmode_menu_item(compose);
+}
+
+static void activate_gnupg_mode (Compose *compose, PrefsAccount *account)
+{
+ if (account->clearsign)
+ compose->sigmode = SIG_MODE_CLEAR;
+ else
+ compose->sigmode = SIG_MODE_DETACH;
+ compose_update_sigmode_menu_item(compose);
+
+ if (account->ascii_armored)
+ compose->encmode = ENC_MODE_ASCII;
+ else
+ compose->encmode = ENC_MODE_DETACH;
+
+ compose_update_encmode_menu_item(compose);
}
#endif /* USE_GPGME */
compose_send_control_enter(compose);
}
-#define EDITABLE_LENGTH(x) \
- strlen(gtk_editable_get_chars(x,0,-1))
-
static void text_inserted(GtkWidget *widget, const gchar *text,
gint length, gint *position, Compose *compose)
{
if (prefs_common.autosave &&
- EDITABLE_LENGTH(editable) % prefs_common.autosave_length == 0)
+ gtk_stext_get_length(GTK_STEXT(widget)) % prefs_common.autosave_length == 0)
compose_draft_cb((gpointer)compose, 1, NULL);
}