(Compose *compose);
static void compose_set_template_menu (Compose *compose);
static void compose_template_apply (Compose *compose,
- Template *tmpl);
+ Template *tmpl,
+ gboolean replace);
static void compose_destroy (Compose *compose);
static void compose_entries_set (Compose *compose,
/* static gint compose_send (Compose *compose); */
static gboolean compose_check_for_valid_recipient
(Compose *compose);
-static gboolean compose_check_entries (Compose *compose);
+static gboolean compose_check_entries (Compose *compose,
+ gboolean check_subject);
static gint compose_write_to_file (Compose *compose,
const gchar *file,
gboolean is_draft);
static gint compose_queue (Compose *compose,
gint *msgnum,
FolderItem **item);
+static gint compose_queue_sub (Compose *compose,
+ gint *msgnum,
+ FolderItem **item,
+ gboolean check_subject);
static void compose_write_attach (Compose *compose,
FILE *fp);
static gint compose_write_headers (Compose *compose,
} \
}
+#define INDENT_CHARS ">|#"
+#define SPACE_CHARS " \t"
+
static void compose_wrap_line(Compose *compose)
{
GtkSText *text = GTK_STEXT(compose->text);
}
line_end = 1;
} else {
- if (ch_len == 1 && strchr(">|:#", *cbuf))
+ if (ch_len == 1
+ && strchr(prefs_common.quote_chars, *cbuf))
quoted = 1;
else if (ch_len != 1 || !isspace(*cbuf))
quoted = 0;
}
line_end = 1;
} else {
- if (line_end && ch_len == 1 && strchr(">|:#", *cbuf))
+ if (line_end && ch_len == 1 &&
+ strchr(prefs_common.quote_chars, *cbuf))
goto compose_end; /* quoted part */
line_end = 0;
#endif
typedef enum {
- WAIT_FOR_SPACETAB,
- WAIT_FOR_INDENTCHAR,
- WAIT_FOR_INDENTCHARORSPACETAB
-} IndentStates;
-
-#define INDCHARS ">|:#"
-#define SPACECHARS " \t"
+ WAIT_FOR_SPACE,
+ WAIT_FOR_INDENT_CHAR,
+ WAIT_FOR_INDENT_CHAR_OR_SPACE
+} IndentState;
/* return indent length, we allow:
> followed by spaces/tabs
{
guint i_len = 0;
guint i, ch_len, alnum_cnt = 0;
- IndentStates state = WAIT_FOR_INDENTCHAR;
- gchar cb[MB_LEN_MAX];
+ IndentState state = WAIT_FOR_INDENT_CHAR;
+ gchar cbuf[MB_LEN_MAX];
gboolean is_space;
gboolean is_indent;
for (i = start_pos; i < text_len; i++) {
- GET_CHAR(i, cb, ch_len);
+ GET_CHAR(i, cbuf, ch_len);
if (ch_len > 1)
break;
- if (cb[0] == '\n')
+ if (cbuf[0] == '\n')
break;
- is_indent = strchr(INDCHARS, cb[0]) ? TRUE : FALSE;
- is_space = strchr(SPACECHARS, cb[0]) ? TRUE : FALSE;
+ is_indent = strchr(prefs_common.quote_chars, cbuf[0]) ? TRUE : FALSE;
+ is_space = strchr(SPACE_CHARS, cbuf[0]) ? TRUE : FALSE;
switch (state) {
- case WAIT_FOR_SPACETAB:
+ case WAIT_FOR_SPACE:
if (is_space == FALSE)
goto out;
- state = WAIT_FOR_INDENTCHARORSPACETAB;
+ state = WAIT_FOR_INDENT_CHAR_OR_SPACE;
break;
- case WAIT_FOR_INDENTCHARORSPACETAB:
+ case WAIT_FOR_INDENT_CHAR_OR_SPACE:
if (is_indent == FALSE && is_space == FALSE &&
- !isupper(cb[0]))
+ !isupper(cbuf[0]))
goto out;
if (is_space == TRUE) {
alnum_cnt = 0;
- state = WAIT_FOR_INDENTCHARORSPACETAB;
+ state = WAIT_FOR_INDENT_CHAR_OR_SPACE;
} else if (is_indent == TRUE) {
alnum_cnt = 0;
- state = WAIT_FOR_SPACETAB;
+ state = WAIT_FOR_SPACE;
} else {
alnum_cnt++;
- state = WAIT_FOR_INDENTCHAR;
- break;
+ state = WAIT_FOR_INDENT_CHAR;
}
break;
- case WAIT_FOR_INDENTCHAR:
- if (is_indent == FALSE && !isupper(cb[0]))
+ case WAIT_FOR_INDENT_CHAR:
+ if (is_indent == FALSE && !isupper(cbuf[0]))
goto out;
if (is_indent == TRUE) {
+ if (alnum_cnt > 0
+ && !strchr(prefs_common.quote_chars, cbuf[0]))
+ goto out;
alnum_cnt = 0;
- state = WAIT_FOR_SPACETAB;
+ state = WAIT_FOR_SPACE;
} else {
alnum_cnt++;
}
}
out:
- if ((i_len > 0) && (state == WAIT_FOR_INDENTCHAR))
+ if ((i_len > 0) && (state == WAIT_FOR_INDENT_CHAR))
i_len -= alnum_cnt;
return i_len;
if ((indent_len > 0) && (indent_len == prev_ilen)) {
GET_CHAR(start_pos + indent_len, cbuf, ch_len);
- if (ch_len == 1 && (cbuf[0] != '\n'))
+ if (ch_len > 0 && (cbuf[0] != '\n'))
do_join = TRUE;
}
/* we have encountered line break */
if (ch_len == 1 && *cbuf == '\n') {
gint clen;
- guint ilen;
gchar cb[MB_CUR_MAX];
/* should we join the next line */
/* if text starts with quote fmt or with
indent string, delete them */
if (i_len) {
+ guint ilen;
ilen = gtkut_stext_str_compare_n
(text, cur_pos, p_pos, i_len,
tlen);
return recipient_found;
}
-static gboolean compose_check_entries(Compose *compose)
+static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
{
gchar *str;
}
str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
- if (*str == '\0') {
+ if (*str == '\0' && check_subject == TRUE) {
AlertValue aval;
aval = alertpanel(_("Send"),
FolderItem *folder;
gint val;
- if (compose_check_entries(compose) == FALSE)
+ if (compose_check_entries(compose, TRUE) == FALSE)
return -1;
val = compose_queue(compose, &msgnum, &folder);
lock = TRUE;
- if (compose_check_entries(compose) == FALSE) {
+ if (compose_check_entries(compose, TRUE) == FALSE) {
lock = FALSE;
return 1;
}
}
/* save message to outbox */
if (prefs_common.savemsg) {
- Folder *folder = FOLDER(compose->account->folder);
- FolderItem *outbox = NULL;
+ FolderItem *outbox;
- if (folder)
- outbox = folder->outbox;
- if (!outbox)
- outbox = folder_get_default_outbox();
+ outbox = account_get_special_folder
+ (compose->account, F_OUTBOX);
if (procmsg_save_to_outbox(outbox, tmp, FALSE) < 0)
alertpanel_error
(_("Can't save the message to outbox."));
return 0;
}
-
static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item)
+{
+ return compose_queue_sub (compose, msgnum, item, FALSE);
+}
+static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gboolean check_subject)
{
FolderItem *queue;
- gchar *tmp, *tmp2, *queue_path;
+ gchar *tmp, *tmp2;
FILE *fp, *src_fp;
GSList *cur;
gchar buf[BUFFSIZE];
lock = TRUE;
- if (compose_check_entries(compose) == FALSE) {
+ if (compose_check_entries(compose, check_subject) == FALSE) {
lock = FALSE;
return -1;
}
return -1;
}
- if (compose->account->folder &&
- FOLDER(compose->account->folder)->queue)
- queue = FOLDER(compose->account->folder)->queue;
- else
- queue = folder_get_default_queue();
-
+ queue = account_get_special_folder(compose->account, F_QUEUE);
+ if (!queue) {
+ g_warning(_("can't find queue folder\n"));
+ unlink(tmp);
+ g_free(tmp);
+ return -1;
+ }
folder_item_scan(queue);
- queue_path = folder_item_get_path(queue);
- if (!is_dir_exist(queue_path))
- make_dir_hier(queue_path);
if ((num = folder_item_add_msg(queue, tmp, TRUE)) < 0) {
g_warning(_("can't queue the message\n"));
unlink(tmp);
g_free(tmp);
- g_free(queue_path);
return -1;
}
unlink(tmp);
fprintf(fp, "\n--%s--\n", compose->boundary);
}
+#define QUOTE_IF_REQUIRED(out, str) \
+{ \
+ if (*str != '"' && strchr(str, ',')) { \
+ gchar *__tmp; \
+ gint len; \
+ \
+ len = strlen(str) + 3; \
+ Xalloca(__tmp, len, return -1); \
+ g_snprintf(__tmp, len, "\"%s\"", str); \
+ out = __tmp; \
+ } else { \
+ Xstrdup_a(out, str, return -1); \
+ } \
+}
+
+#define PUT_RECIPIENT_HEADER(header, str) \
+{ \
+ if (*str != '\0') { \
+ Xstrdup_a(str, str, return -1); \
+ g_strstrip(str); \
+ if (*str != '\0') { \
+ compose->to_list = address_list_append \
+ (compose->to_list, str); \
+ compose_convert_header \
+ (buf, sizeof(buf), str, strlen(header) + 2); \
+ fprintf(fp, "%s: %s\n", header, buf); \
+ } \
+ } \
+}
+
#define IS_IN_CUSTOM_HEADER(header) \
(compose->account->add_customhdr && \
custom_header_find(compose->account->customhdr_list, header) != NULL)
{
gchar buf[BUFFSIZE];
gchar *str;
+ gchar *name;
/* struct utsname utsbuf; */
g_return_val_if_fail(fp != NULL, -1);
compose_convert_header
(buf, sizeof(buf), compose->account->name,
strlen("From: "));
+ QUOTE_IF_REQUIRED(name, buf);
fprintf(fp, "From: %s <%s>\n",
- buf, compose->account->address);
+ name, compose->account->address);
} else
fprintf(fp, "From: %s\n", compose->account->address);
}
#if 0 /* NEW COMPOSE GUI */
if (compose->use_to) {
str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- if (*str != '\0') {
- compose->to_list = address_list_append
- (compose->to_list, str);
- if (!IS_IN_CUSTOM_HEADER("To")) {
- compose_convert_header
- (buf, sizeof(buf), str,
- strlen("To: "));
- fprintf(fp, "To: %s\n", buf);
- }
- }
- }
+ PUT_RECIPIENT_HEADER("To", str);
}
#endif
compose->newsgroup_list =
newsgroup_list_append(compose->newsgroup_list,
str);
- if (!IS_IN_CUSTOM_HEADER("Newsgroups")) {
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Newsgroups: "));
- fprintf(fp, "Newsgroups: %s\n", buf);
- }
+ compose_convert_header(buf, sizeof(buf), str,
+ strlen("Newsgroups: "));
+ fprintf(fp, "Newsgroups: %s\n", buf);
}
}
#endif
#if 0 /* NEW COMPOSE GUI */
if (compose->use_cc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->cc_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- if (*str != '\0') {
- compose->to_list = address_list_append
- (compose->to_list, str);
- if (!IS_IN_CUSTOM_HEADER("Cc")) {
- compose_convert_header
- (buf, sizeof(buf), str,
- strlen("Cc: "));
- fprintf(fp, "Cc: %s\n", buf);
- }
- }
- }
+ PUT_RECIPIENT_HEADER("Cc", str);
}
#endif
/* Bcc */
#if 0 /* NEW COMPOSE GUI */
if (compose->use_bcc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- if (*str != '\0') {
- compose->to_list = address_list_append
- (compose->to_list, str);
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Bcc: "));
- fprintf(fp, "Bcc: %s\n", buf);
- }
- }
+ PUT_RECIPIENT_HEADER("Bcc", str);
}
#endif
GtkPspell * gtkpspell = NULL;
#endif
+ static GdkGeometry geometry;
+
g_return_val_if_fail(account != NULL, NULL);
debug_print(_("Creating compose window...\n"));
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
gtk_widget_set_usize(window, -1, prefs_common.compose_height);
gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
+
+ if (!geometry.max_width) {
+ geometry.max_width = gdk_screen_width();
+ geometry.max_height = gdk_screen_height();
+ }
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
+ &geometry, GDK_HINT_MAX_SIZE);
+
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(compose_delete_cb), compose);
gtk_signal_connect(GTK_OBJECT(window), "destroy",
}
}
-
-static void compose_template_apply(Compose *compose, Template *tmpl)
+static void compose_template_apply(Compose *compose, Template *tmpl,
+ gboolean replace)
{
gchar *qmark;
gchar *parsed_str;
if (tmpl->to && *tmpl->to != '\0')
compose_entry_append(compose, tmpl->to, COMPOSE_TO);
- gtk_stext_clear(GTK_STEXT(compose->text));
+ if (replace)
+ gtk_stext_clear(GTK_STEXT(compose->text));
if (compose->replyinfo == NULL) {
MsgInfo dummyinfo;
tmpl->value, qmark, NULL);
}
- if (parsed_str && prefs_common.auto_sig)
+ if (replace && parsed_str && prefs_common.auto_sig)
compose_insert_sig(compose);
+ if (replace && parsed_str) {
+ gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
+ gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+ }
+
+ if (parsed_str)
+ compose_changed_cb(NULL, compose);
+
gtk_stext_thaw(GTK_STEXT(compose->text));
}
{
Compose *compose = (Compose *)data;
gint val;
+
+ if (prefs_common.work_offline)
+ if (alertpanel(_("Offline warning"),
+ _("You're working offline. Override?"),
+ _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ return;
val = compose_send(compose);
Compose *compose = (Compose *)data;
gint val;
- val = compose_queue(compose, NULL, NULL);
+ val = compose_queue_sub(compose, NULL, NULL, TRUE);
if (!val) gtk_widget_destroy(compose->window);
}
if (lock) return;
- if (compose->account && compose->account->folder &&
- FOLDER(compose->account->folder)->draft)
- draft = FOLDER(compose->account->folder)->draft;
- else
- draft = folder_get_default_draft();
+ draft = account_get_special_folder(compose->account, F_DRAFT);
g_return_if_fail(draft != NULL);
lock = TRUE;
{
Compose *compose = (Compose *)data;
Template *tmpl;
+ gchar *msg;
+ AlertValue val;
tmpl = gtk_object_get_data(GTK_OBJECT(widget), "template");
g_return_if_fail(tmpl != NULL);
- compose_template_apply(compose, tmpl);
+ msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
+ tmpl->name);
+ val = alertpanel(_("Apply template"), msg,
+ _("Replace"), _("Insert"), _("Cancel"));
+ g_free(msg);
+
+ if (val == G_ALERTDEFAULT)
+ compose_template_apply(compose, tmpl, TRUE);
+ else if (val == G_ALERTALTERNATE)
+ compose_template_apply(compose, tmpl, FALSE);
}
static void compose_ext_editor_cb(gpointer data, guint action,
GtkAccelEntry *accel;
GtkWidget *send_menu;
GSList *list;
+ GdkModifierType ignored_mods =
+ (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK |
+ GDK_MOD4_MASK | GDK_MOD5_MASK);
ev = gtk_get_current_event();
if (ev->type != GDK_KEY_PRESS) return FALSE;
list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_menu));
accel = (GtkAccelEntry *)list->data;
if (accel->accelerator_key == kev->keyval &&
- accel->accelerator_mods == kev->state) {
+ (accel->accelerator_mods & ~ignored_mods) ==
+ (kev->state & ~ignored_mods)) {
compose_send_cb(compose, 0, NULL);
return TRUE;
}
projects / claws.git / blobdiff