static void compose_wrap_line_all_full (Compose *compose,
gboolean autowrap);
static void compose_set_title (Compose *compose);
+static void compose_select_account (Compose *compose,
+ PrefsAccount *account);
static PrefsAccount *compose_current_mail_account(void);
/* static gint compose_send (Compose *compose); */
static void toolbar_address_cb (GtkWidget *widget,
gpointer data);
-static void select_account (Compose *compose,
- PrefsAccount *ac);
-
static void account_activated (GtkMenuItem *menuitem,
gpointer data);
if (mailto && *mailto != '\0') {
compose_entries_set(compose, mailto);
- } else if(item && item->prefs->enable_default_to) {
+ } else if (item && item->prefs->enable_default_to) {
compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
compose_entry_select(compose, item->prefs->default_to);
grab_focus_on_last = FALSE;
compose_show_first_last_header(compose, TRUE);
/* Set save folder */
- if(item && item->prefs && item->prefs->save_copy_to_folder) {
+ if (item && item->prefs && item->prefs->save_copy_to_folder) {
gchar *folderidentifier;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
}
/* Grab focus on last header only if no default_to was set */
- if(grab_focus_on_last)
+ if (grab_focus_on_last)
gtk_widget_grab_focus(compose->header_last->entry);
if (prefs_common.auto_exteditor)
}
if (!account) {
gchar cc[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
+ if (!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
extract_address(cc);
account = account_find_from_address(cc);
}
}
/* Set save folder */
- if(msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
+ if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
gchar *folderidentifier;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
account = account_find_from_address(to);
}
- if(!account && prefs_common.forward_account_autosel) {
+ if (!account && prefs_common.forward_account_autosel) {
gchar cc[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
+ if (!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
extract_address(cc);
account = account_find_from_address(cc);
}
g_return_val_if_fail(msginfo != NULL, NULL);
- if(!account)
+ if (!account)
account = cur_account;
g_return_val_if_fail(account != NULL, NULL);
compose_entry_append
(compose, msginfo->from ? msginfo->from : "",
COMPOSE_TO);
- else
- compose_entry_append
- (compose,
- compose->followup_to ? compose->followup_to
- : compose->newsgroups ? compose->newsgroups
- : "",
- COMPOSE_NEWSGROUPS);
+ else {
+ if (compose->followup_to && !strncmp(compose->followup_to,"poster",6)) {
+ compose_entry_append
+ (compose,
+ ((compose->replyto && !ignore_replyto)
+ ? compose->replyto
+ : (compose->mailinglist && !ignore_replyto)
+ ? compose->mailinglist
+ : msginfo->from ? msginfo->from : ""),
+ COMPOSE_TO);
+ } else {
+ compose_entry_append
+ (compose,
+ compose->followup_to ? compose->followup_to
+ : compose->newsgroups ? compose->newsgroups
+ : "",
+ COMPOSE_NEWSGROUPS);
+ }
+ }
}
if (msginfo->subject && *msginfo->subject) {
return ac;
}
+static void compose_select_account(Compose *compose, PrefsAccount *account)
+{
+ GtkWidget *menuitem;
+ GtkItemFactory *ifactory;
+
+ g_return_if_fail(account != NULL);
+
+ compose->account = account;
+
+ compose_set_title(compose);
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+#if 0
+ if (account->protocol == A_NNTP) {
+ gtk_widget_show(compose->newsgroups_hbox);
+ gtk_widget_show(compose->newsgroups_entry);
+ gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 4);
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+ gtk_widget_set_sensitive(menuitem, TRUE);
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+ gtk_widget_set_sensitive(menuitem, TRUE);
+
+ menu_set_sensitive(ifactory, "/View/Followup to", TRUE);
+ } else {
+ gtk_widget_hide(compose->newsgroups_hbox);
+ gtk_widget_hide(compose->newsgroups_entry);
+ gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 0);
+ gtk_widget_queue_resize(compose->table_vbox);
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ gtk_widget_set_sensitive(menuitem, FALSE);
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ gtk_widget_set_sensitive(menuitem, FALSE);
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Followup to");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+ gtk_widget_set_sensitive(menuitem, FALSE);
+ }
+
+ if (account->set_autocc && account->auto_cc &&
+ compose->mode != COMPOSE_REEDIT) {
+ gtk_entry_set_text
+ (GTK_ENTRY(compose->cc_entry), account->auto_cc);
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ }
+ if (account->set_autobcc) {
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ if (account->auto_bcc && compose->mode != COMPOSE_REEDIT)
+ gtk_entry_set_text(GTK_ENTRY(compose->bcc_entry),
+ account->auto_bcc);
+ }
+ if (account->set_autoreplyto) {
+ menuitem = gtk_item_factory_get_item(ifactory,
+ "/View/Reply to");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ if (account->auto_replyto && compose->mode != COMPOSE_REEDIT)
+ gtk_entry_set_text(GTK_ENTRY(compose->reply_entry),
+ account->auto_replyto);
+ }
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ prefs_common.show_ruler);
+#endif
+
+#if USE_GPGME
+ menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ account->default_sign);
+ menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ account->default_encrypt);
+#endif /* USE_GPGME */
+}
+
gboolean compose_check_for_valid_recipient(Compose *compose) {
gchar *recipient_headers_mail[] = {"To:", "Cc:", "Bcc:", NULL};
gchar *recipient_headers_news[] = {"Newsgroups:", NULL};
compose->newsgroup_list = NULL;
/* search header entries for to and newsgroup entries */
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
gchar *header;
gchar *entry;
header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
g_strstrip(entry);
- if(entry[0] != '\0') {
- for(strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
- if(!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ if (entry[0] != '\0') {
+ for (strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
+ if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
compose->to_list = address_list_append(compose->to_list, entry);
recipient_found = TRUE;
}
}
- for(strptr = recipient_headers_news; *strptr != NULL; strptr++) {
- if(!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ for (strptr = recipient_headers_news; *strptr != NULL; strptr++) {
+ if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
compose->newsgroup_list = newsgroup_list_append(compose->newsgroup_list, entry);
recipient_found = TRUE;
}
to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
first_address = TRUE;
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if(g_strcasecmp(headerentryname, cc_hdr) == 0
+ if (g_strcasecmp(headerentryname, cc_hdr) == 0
|| g_strcasecmp(headerentryname, to_hdr) == 0) {
str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
Xstrdup_a(str, str, return -1);
g_strstrip(str);
- if(str[0] != '\0') {
+ if (str[0] != '\0') {
compose_convert_header
(buf, sizeof(buf), str,
strlen("Resent-To") + 2);
- if(first_address) {
+ if (first_address) {
fprintf(fp, "Resent-To: ");
first_address = FALSE;
} else {
}
}
}
- /* if(!first_address) { */
+ /* if (!first_address) { */
fprintf(fp, "\n");
/* } */
out_codeset = CS_ISO_8859_1;
encoding = procmime_get_encoding_for_charset(out_codeset);
+#if USE_GPGME
+ if (!is_draft &&
+ compose->use_signing && !compose->account->clearsign &&
+ encoding == ENC_8BIT)
+ encoding = ENC_BASE64;
+#endif
+
src_codeset = conv_get_current_charset_str();
/* if current encoding is US-ASCII, set it the same as
outgoing one to prevent code conversion failure */
return -1;
}
- if(compose->to_list) {
+ if (compose->to_list) {
if (compose->account->protocol != A_NNTP)
mailac = compose->account;
else if (compose->orig_account->protocol != A_NNTP)
}
}
- if(compose->newsgroup_list) {
+ if (compose->newsgroup_list) {
if (compose->account->protocol == A_NNTP)
newsac = compose->account;
- else if(!(newsac = compose->orig_account) || (newsac->protocol != A_NNTP)) {
+ else if (!(newsac = compose->orig_account) || (newsac->protocol != A_NNTP)) {
lock = FALSE;
alertpanel_error(_("No account for posting news available!"));
return -1;
fprintf(fp, "SSH:\n");
/* write recepient list */
fprintf(fp, "R:");
- if(compose->to_list) {
+ if (compose->to_list) {
fprintf(fp, "<%s>", (gchar *)compose->to_list->data);
for (cur = compose->to_list->next; cur != NULL; cur = cur->next)
fprintf(fp, ",<%s>", (gchar *)cur->data);
fprintf(fp, "\n");
/* write newsgroup list */
fprintf(fp, "NG:");
- if(compose->newsgroup_list) {
+ if (compose->newsgroup_list) {
fprintf(fp, "%s", (gchar *)compose->newsgroup_list->data);
for (cur = compose->newsgroup_list->next; cur != NULL; cur = cur->next)
fprintf(fp, ",%s", (gchar *)cur->data);
}
fprintf(fp, "\n");
/* Sylpheed account IDs */
- if(mailac) {
+ if (mailac) {
fprintf(fp, "MAID:%d\n", mailac->account_id);
}
- if(newsac) {
+ if (newsac) {
fprintf(fp, "NAID:%d\n", newsac->account_id);
}
/* Save copy folder */
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
+ 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);
g_free(savefolderid);
}
/* Message-ID of message replying to */
- if((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
+ if ((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
gchar *folderid;
folderid = folder_item_get_identifier(compose->replyinfo->folder);
folderview_update_item(queue, TRUE);
- if((msgnum != NULL) && (item != NULL)) {
+ if ((msgnum != NULL) && (item != NULL)) {
*msgnum = num;
*item = queue;
}
trans_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
first_address = TRUE;
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if(!g_strcasecmp(trans_hdr, headerentryname)) {
+ if (!g_strcasecmp(trans_hdr, headerentryname)) {
str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
Xstrdup_a(str, str, return -1);
g_strstrip(str);
- if(str[0] != '\0') {
+ if (str[0] != '\0') {
compose_convert_header
(buf, sizeof(buf), str,
strlen(header) + 2);
- if(first_address) {
+ if (first_address) {
fprintf(fp, "%s: ", header);
first_address = FALSE;
} else {
}
}
}
- if(!first_address) {
+ if (!first_address) {
fprintf(fp, "\n");
}
gchar buf[BUFFSIZE];
gchar *str;
gchar *name;
+ GSList *list;
+ gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
+
/* struct utsname utsbuf; */
g_return_val_if_fail(fp != NULL, -1);
g_return_val_if_fail(compose->account->address != NULL, -1);
/* Save copy folder */
- if(is_draft) {
+ if (is_draft) {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
fprintf(fp, "Disposition-Notification-To: %s\n", compose->account->address);
}
}
-
+
+ /* get special headers */
+ for (list = compose->header_list; list; list = list->next) {
+ ComposeHeaderEntry *headerentry;
+ gchar *tmp;
+ gchar *headername;
+ gchar *headername_wcolon;
+ gchar *headername_trans;
+ gchar *headervalue;
+ gchar **string;
+ gboolean standard_header = FALSE;
+
+ headerentry = ((ComposeHeaderEntry *)list->data);
+
+ tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry)));
+ if (!strstr(tmp, ":")) {
+ headername_wcolon = g_strconcat(tmp, ":", NULL);
+ headername = g_strdup(tmp);
+ } else {
+ headername_wcolon = g_strdup(tmp);
+ headername = g_strdup(strtok(tmp, ":"));
+ }
+ g_free(tmp);
+
+ headervalue = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ string = std_headers;
+ while (*string != NULL) {
+ headername_trans = prefs_common.trans_hdr ? gettext(*string) : *string;
+ if (!strcmp(headername_trans,headername_wcolon))
+ standard_header = TRUE;
+ string++;
+ }
+ if (!standard_header && !IS_IN_CUSTOM_HEADER(headername))
+ fprintf(fp, "%s %s\n", headername_wcolon, headervalue);
+
+ g_free(headername);
+ g_free(headername_wcolon);
+
+ }
+
/* separator between header and body */
fputs("\n", fp);
GList *combo_list = NULL;
gchar **string, *header;
ComposeHeaderEntry *headerentry;
+ gboolean standard_header = FALSE;
headerentry = g_new0(ComposeHeaderEntry, 1);
}
gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
g_list_free(combo_list);
- gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), TRUE);
gtk_widget_show(combo);
gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
- if(compose->header_last) {
- header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
- } else {
+ if (compose->header_last) {
+ gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
+ string = headers;
+ while (*string != NULL) {
+ if (!strcmp(*string, last_header_entry))
+ standard_header = TRUE;
+ string++;
+ }
+ if (standard_header)
+ header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
+ }
+ if (!compose->header_last || !standard_header) {
switch(compose->account->protocol) {
case A_NNTP:
header = prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:";
savemsg_checkbtn = gtk_check_button_new_with_label(_("Save Message to "));
gtk_widget_show(savemsg_checkbtn);
gtk_table_attach(GTK_TABLE(table), savemsg_checkbtn, 0, 1, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
- if(account_get_special_folder(compose->account, F_OUTBOX)) {
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), prefs_common.savemsg);
}
gtk_signal_connect(GTK_OBJECT(savemsg_checkbtn), "toggled",
gtk_widget_show(savemsg_entry);
gtk_table_attach_defaults(GTK_TABLE(table), savemsg_entry, 1, 2, rowcount, rowcount + 1);
gtk_editable_set_editable(GTK_EDITABLE(savemsg_entry), prefs_common.savemsg);
- if(account_get_special_folder(compose->account, F_OUTBOX)) {
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
folderidentifier = folder_item_get_identifier(account_get_special_folder
(compose->account, F_OUTBOX));
gtk_entry_set_text(GTK_ENTRY(savemsg_entry), folderidentifier);
gboolean success[1];
GdkFont *font;
GtkWidget *popupmenu;
- GtkWidget *menuitem;
GtkItemFactory *popupfactory;
GtkItemFactory *ifactory;
GtkWidget *tmpl_menu;
gtk_widget_hide(newsgroups_hbox);
gtk_widget_hide(newsgroups_entry);
gtk_table_set_row_spacing(GTK_TABLE(table), 2, 0);
- menu_set_sensitive(ifactory, "/View/Followup to", FALSE);
}
#endif
undo_set_change_state_func(undostruct, &compose_undo_state_changed,
menubar);
- gtk_widget_show(window);
-
address_completion_start(window);
compose->window = window;
}
#endif
- compose_set_title(compose);
-
-#if 0 /* NEW COMPOSE GUI */
- compose->use_bcc = FALSE;
- compose->use_replyto = FALSE;
- compose->use_followupto = FALSE;
-#endif
+ compose_select_account(compose, account);
#if USE_ASPELL
compose->gtkaspell = gtkaspell;
#endif
-#if 0 /* NEW COMPOSE GUI */
- if (account->protocol != A_NNTP) {
- menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_set_sensitive(menuitem, FALSE);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_set_sensitive(menuitem, FALSE);
- }
-#endif
- if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT) {
+ if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
-#if 0 /* NEW COMPOSE GUI */
- compose->use_cc = TRUE;
- gtk_entry_set_text(GTK_ENTRY(cc_entry), account->auto_cc);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-#endif
- }
- if (account->set_autobcc) {
+
+ if (account->set_autobcc)
compose_entry_append(compose, account->auto_bcc, COMPOSE_BCC);
-#if 0 /* NEW COMPOSE GUI */
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- if (account->auto_bcc && mode != COMPOSE_REEDIT)
- gtk_entry_set_text(GTK_ENTRY(bcc_entry),
- account->auto_bcc);
-#endif
- }
- if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT) {
+
+ if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_replyto, COMPOSE_REPLYTO);
-#if 0 /* NEW COMPOSE GUI */
- compose->use_replyto = TRUE;
- menuitem = gtk_item_factory_get_item(ifactory,
- "/View/Reply to");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_entry_set_text(GTK_ENTRY(reply_entry),
- account->auto_replyto);
-#endif
- }
- if (account->protocol != A_NNTP) {
+
+ if (account->protocol != A_NNTP)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("To:") : "To:");
- } else {
+ else
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
- }
-
-#if 0 /* NEW COMPOSE GUI */
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.show_ruler);
-#endif
-
-#if USE_GPGME
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- account->default_sign);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- account->default_encrypt);
-#endif /* USE_GPGME */
addressbook_set_target_compose(compose);
+ update_compose_actions_menu(ifactory, "/Tools/Actions", compose);
compose_set_template_menu(compose);
compose_list = g_list_append(compose_list, compose);
-#if 0 /* NEW COMPOSE GUI */
- compose->use_to = FALSE;
- compose->use_cc = FALSE;
- compose->use_attach = TRUE;
-#endif
-
-#if 0 /* NEW COMPOSE GUI */
- if (!compose->use_bcc) {
- gtk_widget_hide(bcc_hbox);
- gtk_widget_hide(bcc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 4, 0);
- }
- if (!compose->use_replyto) {
- gtk_widget_hide(reply_hbox);
- gtk_widget_hide(reply_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 5, 0);
- }
- if (!compose->use_followupto) {
- gtk_widget_hide(followup_hbox);
- gtk_widget_hide(followup_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
- }
-#endif
if (!prefs_common.show_ruler)
gtk_widget_hide(ruler_hbox);
compose->priority = PRIORITY_NORMAL;
compose_update_priority_menu_item(compose);
- select_account(compose, account);
set_toolbar_style(compose);
+ gtk_widget_show(window);
+
return compose;
}
compose_address_cb(data, 0, NULL);
}
-static void select_account(Compose * compose, PrefsAccount * ac)
-{
-#if USE_GPGME
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
-#endif /* USE_GPGME */
- compose->account = ac;
- compose_set_title(compose);
-
-#if 0 /* NEW COMPOSE GUI */
- if (ac->protocol == A_NNTP) {
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory,
- "/Message/Followup to", TRUE);
- gtk_widget_show(compose->newsgroups_hbox);
- gtk_widget_show(compose->newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 1, 4);
-
- compose->use_to = FALSE;
- compose->use_cc = FALSE;
-
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
- menu_set_sensitive(ifactory,
- "/Message/To", TRUE);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
- gtk_widget_hide(compose->to_hbox);
- gtk_widget_hide(compose->to_entry);
- gtk_widget_hide(compose->cc_hbox);
- gtk_widget_hide(compose->cc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 0, 0);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 3, 0);
- }
- else {
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory,
- "/Message/Followup to", FALSE);
- gtk_entry_set_text(GTK_ENTRY(compose->newsgroups_entry), "");
- gtk_widget_hide(compose->newsgroups_hbox);
- gtk_widget_hide(compose->newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 1, 0);
-
- compose->use_to = TRUE;
- compose->use_cc = TRUE;
-
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- menu_set_sensitive(ifactory,
- "/Message/To", FALSE);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_show(compose->to_hbox);
- gtk_widget_show(compose->to_entry);
- gtk_widget_show(compose->cc_hbox);
- gtk_widget_show(compose->cc_entry);
-
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 0, 4);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 3, 4);
- }
- gtk_widget_queue_resize(compose->table_vbox);
-#endif
-#if USE_GPGME
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory,
- "/Message/Sign", TRUE);
- menu_set_sensitive(ifactory,
- "/Message/Encrypt", TRUE);
-
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
- if (ac->default_sign)
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- else
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
- if (ac->default_encrypt)
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- else
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-#endif /* USE_GPGME */
-
-}
-
static void account_activated(GtkMenuItem *menuitem, gpointer data)
{
Compose *compose = (Compose *)data;
g_return_if_fail(ac != NULL);
if (ac != compose->account)
- select_account(compose, ac);
+ compose_select_account(compose, ac);
}
static void attach_selected(GtkCList *clist, gint row, gint column,