Index: ml/src/compose.c diff -c ml/src/compose.c:1.2 ml/src/compose.c:1.3 *** ml/src/compose.c:1.2 Wed Oct 8 02:00:46 1997 --- ml/src/compose.c Wed Oct 8 23:45:56 1997 *************** *** 207,240 **** MLComposeOptions *options = (MLComposeOptions *) fs_get(sizeof(MLComposeOptions)); options->window = NULL; options->addsig = preferences.addsig; - options->verbose = preferences.smtp_debug; options->keep_open = preferences.keep_open; options->send_eight = preferences.send_eight; options->word_wrap = preferences.word_wrap; ! options->message_log = preferences.logit; ! options->log_attachments = preferences.log_full; options->addsig_tmp = preferences.addsig; - options->verbose_tmp = preferences.smtp_debug; options->keep_open_tmp = preferences.keep_open; options->send_eight_tmp = preferences.send_eight; options->word_wrap_tmp = preferences.word_wrap; - options->message_log_tmp = preferences.logit; - options->log_attachments_tmp = preferences.log_full; - options->mailhost = cpystr(preferences.smtp_server); - options->nntphost = cpystr(preferences.nntp_server); - options->domain = cpystr(preferences.default_domain); - options->replyto = cpystr(preferences.reply_address); options->charset = cpystr(preferences.charset); ! options->sigfile = cpystr(preferences.signature_file); options->language = cpystr(preferences.language); options->outlog = cpystr(preferences.sendlog); - options->defcc = cpystr(preferences.default_cc); - options->defbcc = cpystr(preferences.default_bcc); options->prefix = cpystr(preferences.reply_prefix); return(options); } --- 207,245 ---- MLComposeOptions *options = (MLComposeOptions *) fs_get(sizeof(MLComposeOptions)); options->window = NULL; + options->addsig = preferences.addsig; options->keep_open = preferences.keep_open; + options->log_attachments = preferences.log_full; + options->message_log = preferences.logit; options->send_eight = preferences.send_eight; + options->textInReply = preferences.textInReply; + options->verbose = preferences.smtp_debug; options->word_wrap = preferences.word_wrap; ! options->addsig_tmp = preferences.addsig; options->keep_open_tmp = preferences.keep_open; + options->log_attachments_tmp = preferences.log_full; + options->message_log_tmp = preferences.logit; options->send_eight_tmp = preferences.send_eight; + options->textInReply_tmp = preferences.textInReply; + options->verbose_tmp = preferences.smtp_debug; options->word_wrap_tmp = preferences.word_wrap; options->charset = cpystr(preferences.charset); ! options->defbcc = cpystr(preferences.default_bcc); ! options->defcc = cpystr(preferences.default_cc); ! options->domain = cpystr(preferences.default_domain); options->language = cpystr(preferences.language); + options->mailhost = cpystr(preferences.smtp_server); + options->nntphost = cpystr(preferences.nntp_server); options->outlog = cpystr(preferences.sendlog); options->prefix = cpystr(preferences.reply_prefix); + options->replyto = cpystr(preferences.reply_address); + options->sigfile = cpystr(preferences.signature_file); + return(options); } *************** *** 313,318 **** --- 318,328 ---- compose_set_window_title(compose,type,news,lview,message,read_info); compose_check_buttons(compose); + + /* These are NULL because we don't care */ + if(compose->options->textInReply_tmp == TRUE) + compose_reply_insert(NULL, compose, NULL); + if(compose->options->addsig_tmp == TRUE) compose_append_autograph(compose); return; *************** *** 3901,3906 **** --- 3911,3917 ---- XtAddCallback(win->keep_open, XmNvalueChangedCallback, (XtCallbackProc) cwin_keep_open, compose); + /* Option to add a .signature */ XtManageChild(win->rowcol); XtSetArg(args[n], XmNborderWidth, 0); n ++; XtSetArg(args[n], XmNtraversalOn, FALSE); n ++; *************** *** 3911,3916 **** --- 3922,3940 ---- XtAddCallback(win->addsig, XmNvalueChangedCallback, (XtCallbackProc) cwin_addsig, compose); + /* Option to add reply text */ + XtManageChild(win->rowcol); + XtSetArg(args[n], XmNborderWidth, 0); n ++; + XtSetArg(args[n], XmNtraversalOn, FALSE); n ++; + win->textInReply = XmCreateToggleButton(win->rowcol, "textInReply", + args, n); n = 0; + XtManageChild(win->textInReply); + + XtAddCallback(win->textInReply, XmNvalueChangedCallback, + (XtCallbackProc) cwin_textInReply, compose); + + /* ************************************************* */ + XtSetArg(args[n], XmNborderWidth, 0); n ++; XtSetArg(args[n], XmNtraversalOn, FALSE); n ++; win->send_eight = XmCreateToggleButton(win->rowcol, "send_eight_toggle", *************** *** 3995,4000 **** --- 4019,4025 ---- XmToggleButtonSetState(win->verbose,options->verbose,FALSE); XmToggleButtonSetState(win->addsig,options->addsig,FALSE); + XmToggleButtonSetState(win->textInReply,options->textInReply,FALSE); XmToggleButtonSetState(win->keep_open,options->keep_open,FALSE); XmToggleButtonSetState(win->send_eight,options->send_eight,FALSE); XmToggleButtonSetState(win->word_wrap,options->word_wrap,FALSE); *************** *** 4054,4066 **** fs_give((void **) &preferences.default_bcc); preferences.default_bcc = cpystr(options->defbcc); ! preferences.smtp_debug = options->verbose; ! preferences.addsig = options->addsig; ! preferences.keep_open = options->keep_open; ! preferences.send_eight = options->send_eight; ! preferences.word_wrap = options->word_wrap; ! preferences.logit = options->message_log; ! preferences.log_full = options->log_attachments; save_defaults(); cwin_dismiss(w,compose,xp); --- 4079,4092 ---- fs_give((void **) &preferences.default_bcc); preferences.default_bcc = cpystr(options->defbcc); ! preferences.addsig = options->addsig; ! preferences.keep_open = options->keep_open; ! preferences.log_full = options->log_attachments; ! preferences.logit = options->message_log; ! preferences.send_eight = options->send_eight; ! preferences.smtp_debug = options->verbose; ! preferences.textInReply = options->textInReply; ! preferences.word_wrap = options->word_wrap; save_defaults(); cwin_dismiss(w,compose,xp); *************** *** 4153,4164 **** compose_wrap_off(NULL,compose,NULL); options->addsig = options->addsig_tmp; - options->verbose = options->verbose_tmp; options->keep_open = options->keep_open_tmp; options->send_eight = options->send_eight_tmp; options->word_wrap = options->word_wrap_tmp; - options->message_log = options->message_log_tmp; - options->log_attachments = options->log_attachments_tmp; return; --- 4179,4191 ---- compose_wrap_off(NULL,compose,NULL); options->addsig = options->addsig_tmp; options->keep_open = options->keep_open_tmp; + options->log_attachments = options->log_attachments_tmp; + options->message_log = options->message_log_tmp; options->send_eight = options->send_eight_tmp; + options->textInReply = options->textInReply_tmp; + options->verbose = options->verbose_tmp; options->word_wrap = options->word_wrap_tmp; return; *************** *** 4183,4188 **** --- 4210,4237 ---- options->verbose_tmp = FALSE; return; } + + /* Callback for add reply text checkbox */ + + #ifdef __STDC__ + void cwin_textInReply(Widget w,MLCompose *compose, + XmToggleButtonCallbackStruct *xp) + #else + void cwin_textInReply(w,compose,xp) + Widget w; + MLCompose *compose; + XmToggleButtonCallbackStruct *xp; + #endif + { + MLComposeOptions *options = compose->options; + if(xp->set == TRUE) + options->textInReply_tmp = TRUE; + else + options->textInReply_tmp = FALSE; + return; + } + + /* Callback for add signature check box */ #ifdef __STDC__ void cwin_addsig(Widget w,MLCompose *compose, Index: ml/src/preferences.c diff -c ml/src/preferences.c:1.2 ml/src/preferences.c:1.3 *** ml/src/preferences.c:1.2 Wed Oct 8 02:00:49 1997 --- ml/src/preferences.c Wed Oct 8 23:45:57 1997 *************** *** 38,63 **** XtOffset(Preferences*,defaultConfig), XtRImmediate, (void*) DEFAULT_CONFIG }, ! { "smtp_server","Smtp_server", XtRString, sizeof(char *), ! XtOffset(Preferences*,smtp_server), ! XtRImmediate, (void *) EMPTYSTR }, ! { "nntp_server","Nntp_server", XtRString, sizeof(char *), ! XtOffset(Preferences*,nntp_server), ! XtRImmediate, (void *) EMPTYSTR }, ! { "default_domain","Default_domain", XtRString, sizeof(char *), ! XtOffset(Preferences*,default_domain), XtRImmediate, (void *) EMPTYSTR }, { "default_cc","Default_cc", XtRString, sizeof(char *), XtOffset(Preferences*,default_cc), XtRImmediate, (void *) EMPTYSTR }, ! { "default_bcc","Default_bcc", XtRString, sizeof(char *), ! XtOffset(Preferences*,default_bcc), XtRImmediate, (void *) EMPTYSTR }, { "default_mailbox","Default_mailbox", XtRString, sizeof(char *), XtOffset(Preferences*,default_mailbox), --- 38,99 ---- XtOffset(Preferences*,defaultConfig), XtRImmediate, (void*) DEFAULT_CONFIG }, ! { "add_sig", "Add_sig", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, addsig), ! XtRBoolean, (void*) &default_false }, ! { "alert_new", "alert_new", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, alert_new), ! XtRBoolean, (void*) &default_true }, ! { "authLogin", "AuthLogin", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, authLogin), ! XtRBoolean, (void*) &default_true }, ! { "autoPlace", "AutoPlace", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, autoPlace), ! XtRBoolean, (void*) &default_true }, ! { "auto_open", "Auto_open", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, auto_open), ! XtRBoolean, (void*) &default_false }, ! { "charset", "Charset", XtRString, sizeof(char *), ! XtOffset(Preferences*,charset), ! XtRImmediate, (void*) US_ASCII_STR }, ! { "check_interval", "Check_interval", ! XtRInt, sizeof(int), ! XtOffset(Preferences*,check_interval), ! XtRString, (void*) DEFAULT_RESOURCE_CHECK_INT }, ! { "confirmDestroy", "ConfirmDestroy", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, confirmDestroy), ! XtRBoolean, (void*) &default_true }, ! { "decode_all", "decode_all", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, decode_all), ! XtRBoolean, (void*) &default_false }, ! { "default_action","Default_action", XtRString, sizeof(char *), ! XtOffset(Preferences*,default_action), ! XtRImmediate, (void*) EMPTYSTR }, ! { "default_bcc","Default_bcc", XtRString, sizeof(char *), ! XtOffset(Preferences*,default_bcc), XtRImmediate, (void *) EMPTYSTR }, { "default_cc","Default_cc", XtRString, sizeof(char *), XtOffset(Preferences*,default_cc), XtRImmediate, (void *) EMPTYSTR }, ! { "default_domain","Default_domain", XtRString, sizeof(char *), ! XtOffset(Preferences*,default_domain), XtRImmediate, (void *) EMPTYSTR }, + { "default_file_pattern","Default_file_pattern", + XtRString, sizeof(char *), + XtOffset(Preferences*,default_file_pattern), + XtRImmediate, (void*) FILEALLPATTERN }, { "default_mailbox","Default_mailbox", XtRString, sizeof(char *), XtOffset(Preferences*,default_mailbox), *************** *** 66,295 **** XtRString, sizeof(char *), XtOffset(Preferences*,default_mailbox_pattern), XtRImmediate, (void*) MAILBOXDEFAULTPATTERN }, - { "default_file_pattern","Default_file_pattern", - XtRString, sizeof(char *), - XtOffset(Preferences*,default_file_pattern), - XtRImmediate, (void*) FILEALLPATTERN }, - { "sendlog","Sendlog", - XtRString, sizeof(char *), - XtOffset(Preferences*,sendlog), - XtRImmediate, (void*) EMPTYSTR }, - { "netCheckCommand","NetCheckCommand", - XtRString, sizeof(char *), - XtOffset(Preferences*,netCheckCommand), - XtRImmediate, (void*) EMPTYSTR }, - { "netStartCommand","NetStartCommand", - XtRString, sizeof(char *), - XtOffset(Preferences*,netStartCommand), - XtRImmediate, (void*) EMPTYSTR }, - { "netCheckDelay", "NetCheckDelay", - XtRInt, sizeof(int), - XtOffset(Preferences*,netCheckDelay), - XtRString, (void*) DEFAULT_NETCHECK }, - { "header_set","Header_set", - XtRString, sizeof(char *), - XtOffset(Preferences*,header_set), - XtRImmediate, (void*) DEFAULTHEADERS }, { "default_savebox","Default_savebox", XtRString, sizeof(char *), XtOffset(Preferences*,default_savebox), XtRImmediate, (void*) EMPTYSTR }, ! { "default_action","Default_action", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,default_action), ! XtRImmediate, (void*) EMPTYSTR }, ! { "viewline_format","Viewline_format", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,viewline_format), ! XtRImmediate, (void*) VIEWLINE_FORMAT_STR }, ! { "url_command","Url_command", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,url_command), ! XtRImmediate, (void*) EMPTYSTR }, ! { "newMailProg","NewMailProg", XtRString, sizeof(char *), ! XtOffset(Preferences*,newMailProg), ! XtRImmediate, (void*) EMPTYSTR }, { "folder_path","Folder_path", XtRString, sizeof(char *), XtOffset(Preferences*,folder_path), XtRImmediate, (void*) INBOX }, ! { "charset","Charset", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,charset), ! XtRImmediate, (void*) US_ASCII_STR }, ! { "language","Language", XtRString, sizeof(char *), ! XtOffset(Preferences*,language), ! XtRImmediate, (void*) EMPTYSTR }, { "help_directory", "Help_directory", XtRString, sizeof(char *), XtOffset(Preferences*,help_directory), XtRImmediate, (void*) DEFAULT_LIBDIR }, ! { "mime_directory", "Mime_directory", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,mime_directory), ! XtRImmediate, (void*) DEFAULT_LIBDIR }, { "ispellCommand", "IspellCommand", XtRString, sizeof(char *), XtOffset(Preferences*,ispellCommand), XtRImmediate, (void*) ISPELL_COMMAND }, ! { "smartReply", "SmartReply", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,smart_reply), ! XtRImmediate, (void*) EMPTYSTR }, ! { "signature_file", "Signature_file", ! XtRString, sizeof(char *), ! XtOffset(Preferences*, signature_file), ! XtRImmediate, (void *) EMPTYSTR }, ! { "print_command", "Print_command", ! XtRString, sizeof(char *), ! XtOffset(Preferences*, print_command), ! XtRImmediate, (void *) EMPTYSTR }, ! { "reply_address", "Reply_address", XtRString, sizeof(char *), ! XtOffset(Preferences*,reply_address), XtRImmediate, (void*) EMPTYSTR }, ! { "reply_prefix", "Reply_prefix", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,reply_prefix), ! XtRImmediate, (void*) DEFAULTINSERT_STR }, ! { "mail_sort", "Mail_sort", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,mail_sort), ! XtRImmediate, (void*) NORMALSTR }, ! { "news_sort", "News_sort", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,news_sort), ! XtRImmediate, (void*) NORMALSTR }, ! { "check_interval", "Check_interval", XtRInt, sizeof(int), ! XtOffset(Preferences*,check_interval), ! XtRString, (void*) DEFAULT_RESOURCE_CHECK_INT }, { "mail_prefetch", "Mail_prefetch", XtRInt, sizeof(int), XtOffset(Preferences*,mail_prefetch), XtRString, (void*) DEFAULT_PREFETCH }, ! { "news_prefetch", "News_prefetch", ! XtRInt, sizeof(int), ! XtOffset(Preferences*,news_prefetch), ! XtRString, (void*) DEFAULT_PREFETCH }, ! { "mail_background", "Mail_background", XtRInt, sizeof(int), ! XtOffset(Preferences*,mail_background), ! XtRString, (void*) DEFAULT_BGTIME }, { "news_background", "News_background", XtRInt, sizeof(int), XtOffset(Preferences*,news_background), XtRString, (void*) DEFAULT_BGTIME }, - { "mail_fetch", "Mail_fetch", - XtRInt, sizeof(int), - XtOffset(Preferences*,mail_fetch), - XtRString, (void*) DEFAULT_FETCH }, { "news_fetch", "News_fetch", XtRInt, sizeof(int), XtOffset(Preferences*,news_fetch), XtRString, (void*) DEFAULT_FETCH }, { "note_save", "Note_save", XtRInt, sizeof(int), XtOffset(Preferences*,note_save), XtRString, (void*) DEFAULT_RESOURCE_NOTE_SAVE }, ! { "auto_open", "Auto_open", XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, auto_open), XtRBoolean, (void*) &default_false }, { "tear_off", "Tear_off", XtRBoolean, sizeof (Boolean), XtOffset(Preferences*, tear_off), XtRBoolean, (void*) &default_false }, ! { "mime_ask", "mime_ask", XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, mime_ask), ! XtRBoolean, (void*) &default_true }, ! { "logit", "Logit", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, logit), XtRBoolean, (void*) &default_false }, { "useIspell", "UseIspell", XtRBoolean, sizeof (Boolean), XtOffset(Preferences*, useIspell), XtRBoolean, (void*) &default_false }, { "word_wrap", "Word_wrap", XtRBoolean, sizeof (Boolean), XtOffset(Preferences*, word_wrap), XtRBoolean, (void*) &default_true }, ! { "add_sig", "Add_sig", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, addsig), ! XtRBoolean, (void*) &default_false }, ! { "keep_open", "Keep_open", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, keep_open), ! XtRBoolean, (void*) &default_false }, ! { "developer_debug", "Developer_debug", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, developer_debug), ! XtRBoolean, (void*) &default_false }, ! { "hide_empty", "Hide_empty", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, hide_empty), ! XtRBoolean, (void*) &default_false }, ! { "local_defs", "Local_defs", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, local_defs), ! XtRBoolean, (void*) &default_false }, ! { "new_news", "New_news", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, new_news), ! XtRBoolean, (void*) &default_false }, ! { "send_eight", "Send_eight", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, send_eight), ! XtRBoolean, (void*) &default_false }, ! { "log_full", "Log_full", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, log_full), ! XtRBoolean, (void*) &default_false }, ! { "decode_all", "decode_all", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, decode_all), ! XtRBoolean, (void*) &default_false }, ! { "alert_new", "alert_new", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, alert_new), ! XtRBoolean, (void*) &default_true }, ! { "confirmDestroy", "ConfirmDestroy", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, confirmDestroy), ! XtRBoolean, (void*) &default_true }, ! { "newMailBeep", "NewMailBeep", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, newMailBeep), ! XtRBoolean, (void*) &default_true }, ! { "keepOnServer", "KeepOnServer", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, keepOnServer), ! XtRBoolean, (void*) &default_false }, ! { "autoPlace", "AutoPlace", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, autoPlace), ! XtRBoolean, (void*) &default_true }, ! { "showLog", "ShowLog", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, showLog), ! XtRBoolean, (void*) &default_false }, ! { "authLogin", "AuthLogin", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, authLogin), ! XtRBoolean, (void*) &default_true }, ! { "defaults_installed", "Defaults_installed", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, defaults_installed), ! XtRBoolean, (void*) &default_false }, ! { "defaults_version", "Defaults_version", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,defaults_version), ! XtRImmediate, (void*) NO_DEFAULTS_VERSION }, }; struct prefinfo prefs[] = { --- 102,300 ---- XtRString, sizeof(char *), XtOffset(Preferences*,default_mailbox_pattern), XtRImmediate, (void*) MAILBOXDEFAULTPATTERN }, { "default_savebox","Default_savebox", XtRString, sizeof(char *), XtOffset(Preferences*,default_savebox), XtRImmediate, (void*) EMPTYSTR }, ! { "defaults_installed", "Defaults_installed", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, defaults_installed), ! XtRBoolean, (void*) &default_false }, ! { "defaults_version", "Defaults_version", XtRString, sizeof(char *), ! XtOffset(Preferences*,defaults_version), ! XtRImmediate, (void*) NO_DEFAULTS_VERSION }, ! { "developer_debug", "Developer_debug", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, developer_debug), ! XtRBoolean, (void*) &default_false }, { "folder_path","Folder_path", XtRString, sizeof(char *), XtOffset(Preferences*,folder_path), XtRImmediate, (void*) INBOX }, ! { "header_set","Header_set", XtRString, sizeof(char *), ! XtOffset(Preferences*,header_set), ! XtRImmediate, (void*) DEFAULTHEADERS }, { "help_directory", "Help_directory", XtRString, sizeof(char *), XtOffset(Preferences*,help_directory), XtRImmediate, (void*) DEFAULT_LIBDIR }, ! { "hide_empty", "Hide_empty", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, hide_empty), ! XtRBoolean, (void*) &default_false }, { "ispellCommand", "IspellCommand", XtRString, sizeof(char *), XtOffset(Preferences*,ispellCommand), XtRImmediate, (void*) ISPELL_COMMAND }, ! { "keepOnServer", "KeepOnServer", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, keepOnServer), ! XtRBoolean, (void*) &default_false }, ! { "keep_open", "Keep_open", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, keep_open), ! XtRBoolean, (void*) &default_false }, ! { "language","Language", XtRString, sizeof(char *), ! XtOffset(Preferences*,language), XtRImmediate, (void*) EMPTYSTR }, ! { "local_defs", "Local_defs", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, local_defs), ! XtRBoolean, (void*) &default_false }, ! { "log_full", "Log_full", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, log_full), ! XtRBoolean, (void*) &default_false }, ! { "logit", "Logit", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, logit), ! XtRBoolean, (void*) &default_false }, ! { "mail_background", "Mail_background", XtRInt, sizeof(int), ! XtOffset(Preferences*,mail_background), ! XtRString, (void*) DEFAULT_BGTIME }, ! { "mail_fetch", "Mail_fetch", ! XtRInt, sizeof(int), ! XtOffset(Preferences*,mail_fetch), ! XtRString, (void*) DEFAULT_FETCH }, { "mail_prefetch", "Mail_prefetch", XtRInt, sizeof(int), XtOffset(Preferences*,mail_prefetch), XtRString, (void*) DEFAULT_PREFETCH }, ! { "mail_sort", "Mail_sort", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,mail_sort), ! XtRImmediate, (void*) NORMALSTR }, ! { "mime_ask", "mime_ask", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, mime_ask), ! XtRBoolean, (void*) &default_true }, ! { "mime_directory", "Mime_directory", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,mime_directory), ! XtRImmediate, (void*) DEFAULT_LIBDIR }, ! { "netCheckCommand","NetCheckCommand", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,netCheckCommand), ! XtRImmediate, (void*) EMPTYSTR }, ! { "netCheckDelay", "NetCheckDelay", XtRInt, sizeof(int), ! XtOffset(Preferences*,netCheckDelay), ! XtRString, (void*) DEFAULT_NETCHECK }, ! { "netStartCommand","NetStartCommand", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,netStartCommand), ! XtRImmediate, (void*) EMPTYSTR }, ! { "newMailBeep", "NewMailBeep", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, newMailBeep), ! XtRBoolean, (void*) &default_true }, ! { "newMailProg","NewMailProg", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,newMailProg), ! XtRImmediate, (void*) EMPTYSTR }, ! { "new_news", "New_news", ! XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, new_news), ! XtRBoolean, (void*) &default_false }, { "news_background", "News_background", XtRInt, sizeof(int), XtOffset(Preferences*,news_background), XtRString, (void*) DEFAULT_BGTIME }, { "news_fetch", "News_fetch", XtRInt, sizeof(int), XtOffset(Preferences*,news_fetch), XtRString, (void*) DEFAULT_FETCH }, + { "news_prefetch", "News_prefetch", + XtRInt, sizeof(int), + XtOffset(Preferences*,news_prefetch), + XtRString, (void*) DEFAULT_PREFETCH }, + { "news_sort", "News_sort", + XtRString, sizeof(char *), + XtOffset(Preferences*,news_sort), + XtRImmediate, (void*) NORMALSTR }, + { "nntp_server","Nntp_server", + XtRString, sizeof(char *), + XtOffset(Preferences*,nntp_server), + XtRImmediate, (void *) EMPTYSTR }, { "note_save", "Note_save", XtRInt, sizeof(int), XtOffset(Preferences*,note_save), XtRString, (void*) DEFAULT_RESOURCE_NOTE_SAVE }, ! { "print_command", "Print_command", ! XtRString, sizeof(char *), ! XtOffset(Preferences*, print_command), ! XtRImmediate, (void *) EMPTYSTR }, ! { "reply_address", "Reply_address", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,reply_address), ! XtRImmediate, (void*) EMPTYSTR }, ! { "reply_prefix", "Reply_prefix", ! XtRString, sizeof(char *), ! XtOffset(Preferences*,reply_prefix), ! XtRImmediate, (void*) DEFAULTINSERT_STR }, ! { "send_eight", "Send_eight", XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, send_eight), XtRBoolean, (void*) &default_false }, + { "sendlog","Sendlog", + XtRString, sizeof(char *), + XtOffset(Preferences*,sendlog), + XtRImmediate, (void*) EMPTYSTR }, + { "showLog", "ShowLog", + XtRBoolean, sizeof (Boolean), + XtOffset(Preferences*, showLog), + XtRBoolean, (void*) &default_false }, + { "signature_file", "Signature_file", + XtRString, sizeof(char *), + XtOffset(Preferences*, signature_file), + XtRImmediate, (void *) EMPTYSTR }, + { "smartReply", "SmartReply", + XtRString, sizeof(char *), + XtOffset(Preferences*,smart_reply), + XtRImmediate, (void*) EMPTYSTR }, + { "smtp_server","Smtp_server", + XtRString, sizeof(char *), + XtOffset(Preferences*,smtp_server), + XtRImmediate, (void *) EMPTYSTR }, { "tear_off", "Tear_off", XtRBoolean, sizeof (Boolean), XtOffset(Preferences*, tear_off), XtRBoolean, (void*) &default_false }, ! { "textInReply", "Text_in_reply", XtRBoolean, sizeof (Boolean), ! XtOffset(Preferences*, textInReply), XtRBoolean, (void*) &default_false }, + { "url_command","Url_command", + XtRString, sizeof(char *), + XtOffset(Preferences*,url_command), + XtRImmediate, (void*) EMPTYSTR }, { "useIspell", "UseIspell", XtRBoolean, sizeof (Boolean), XtOffset(Preferences*, useIspell), XtRBoolean, (void*) &default_false }, + { "viewline_format","Viewline_format", + XtRString, sizeof(char *), + XtOffset(Preferences*,viewline_format), + XtRImmediate, (void*) VIEWLINE_FORMAT_STR }, { "word_wrap", "Word_wrap", XtRBoolean, sizeof (Boolean), XtOffset(Preferences*, word_wrap), XtRBoolean, (void*) &default_true }, ! }; struct prefinfo prefs[] = { *************** *** 297,511 **** PREF_TYPE_STR, &preferences.defaultConfig, }, - { "smtp_server", - PREF_TYPE_STR, - &preferences.smtp_server, - }, - { "default_domain", - PREF_TYPE_STR, - &preferences.default_domain, - }, - { "folder_path", - PREF_TYPE_STR, - &preferences.folder_path, - }, - { "default_action", - PREF_TYPE_STR, - &preferences.default_action, - }, - { "default_cc", - PREF_TYPE_STR, - &preferences.default_cc, - }, - { "default_bcc", - PREF_TYPE_STR, - &preferences.default_bcc, - }, - { "sendlog", - PREF_TYPE_STR, - &preferences.sendlog, - }, - { "url_command", - PREF_TYPE_STR, - &preferences.url_command, - }, - { "newMailProg", - PREF_TYPE_STR, - &preferences.newMailProg, - }, - { "nntp_server", - PREF_TYPE_STR, - &preferences.nntp_server, - }, - { "default_mailbox", - PREF_TYPE_STR, - &preferences.default_mailbox, - }, - { "default_savebox", - PREF_TYPE_STR, - &preferences.default_savebox, - }, - { "help_directory", - PREF_TYPE_STR, - &preferences.help_directory, - }, - { "header_set", - PREF_TYPE_STR, - &preferences.header_set, - }, - { "viewline_format", - PREF_TYPE_STR, - &preferences.viewline_format, - }, ! { "mime_directory", ! PREF_TYPE_STR, ! &preferences.mime_directory, ! }, ! { "reply_address", ! PREF_TYPE_STR, ! &preferences.reply_address, ! }, ! { "print_command", ! PREF_TYPE_STR, ! &preferences.print_command, ! }, ! { "signature_file", ! PREF_TYPE_STR, ! &preferences.signature_file, ! }, ! { "charset", ! PREF_TYPE_STR, ! &preferences.charset, ! }, ! { "language", ! PREF_TYPE_STR, ! &preferences.language, ! }, ! { "mail_sort", ! PREF_TYPE_STR, ! &preferences.mail_sort, ! }, ! { "news_sort", ! PREF_TYPE_STR, ! &preferences.news_sort, ! }, ! { "check_interval", ! PREF_TYPE_INT, ! &preferences.check_interval, ! }, ! { "mail_prefetch", ! PREF_TYPE_INT, ! &preferences.mail_prefetch, ! }, ! { "news_prefetch", ! PREF_TYPE_INT, ! &preferences.news_prefetch, ! }, ! { "mail_background", ! PREF_TYPE_INT, ! &preferences.mail_background, ! }, ! { "news_background", ! PREF_TYPE_INT, ! &preferences.news_background, ! }, ! { "mail_fetch", ! PREF_TYPE_INT, ! &preferences.mail_fetch, ! }, ! { "news_fetch", ! PREF_TYPE_INT, ! &preferences.news_fetch, ! }, ! { "note_save", ! PREF_TYPE_INT, ! &preferences.note_save, ! }, ! { "smtp_debug", ! PREF_TYPE_BOOL, ! &preferences.smtp_debug, ! }, ! { "useIspell", ! PREF_TYPE_BOOL, ! &preferences.useIspell, ! }, ! { "auto_open", ! PREF_TYPE_BOOL, ! &preferences.auto_open, ! }, ! { "tear_off", ! PREF_TYPE_BOOL, ! &preferences.tear_off, ! }, ! { "mime_ask", ! PREF_TYPE_BOOL, ! &preferences.mime_ask, ! }, ! { "log_full", ! PREF_TYPE_BOOL, ! &preferences.log_full, ! }, ! { "send_eight", ! PREF_TYPE_BOOL, ! &preferences.send_eight, ! }, ! { "confirmDestroy", ! PREF_TYPE_BOOL, ! &preferences.confirmDestroy, ! }, ! { "decode_all", ! PREF_TYPE_BOOL, ! &preferences.decode_all, ! }, ! { "alert_new", ! PREF_TYPE_BOOL, ! &preferences.alert_new, ! }, ! { "developer_debug", ! PREF_TYPE_BOOL, ! &preferences.developer_debug, ! }, ! { "hide_empty", ! PREF_TYPE_BOOL, ! &preferences.hide_empty, ! }, ! { "keep_open", ! PREF_TYPE_BOOL, ! &preferences.keep_open, ! }, ! { "logit", ! PREF_TYPE_BOOL, ! &preferences.logit, ! }, ! { "word_wrap", ! PREF_TYPE_BOOL, ! &preferences.word_wrap, ! }, ! { "newMailBeep", ! PREF_TYPE_BOOL, ! &preferences.newMailBeep, ! }, ! { "keepOnServer", ! PREF_TYPE_BOOL, ! &preferences.keepOnServer, ! }, ! { "autoPlace", ! PREF_TYPE_BOOL, ! &preferences.autoPlace, ! }, ! { "showLog", ! PREF_TYPE_BOOL, ! &preferences.showLog, ! }, ! { "authLogin", ! PREF_TYPE_BOOL, ! &preferences.authLogin, ! }, ! { "add_sig", ! PREF_TYPE_BOOL, ! &preferences.addsig, ! }, }; --- 302,362 ---- PREF_TYPE_STR, &preferences.defaultConfig, }, ! { "add_sig", PREF_TYPE_BOOL, &preferences.addsig, }, ! { "alert_new", PREF_TYPE_BOOL, &preferences.alert_new, }, ! { "authLogin", PREF_TYPE_BOOL, &preferences.authLogin, }, ! { "autoPlace", PREF_TYPE_BOOL, &preferences.autoPlace, }, ! { "auto_open", PREF_TYPE_BOOL, &preferences.auto_open, }, ! { "charset", PREF_TYPE_STR, &preferences.charset, }, ! { "check_interval", PREF_TYPE_INT, &preferences.check_interval, }, ! { "confirmDestroy", PREF_TYPE_BOOL, &preferences.confirmDestroy, }, ! { "decode_all", PREF_TYPE_BOOL, &preferences.decode_all, }, ! { "default_action", PREF_TYPE_STR, &preferences.default_action, }, ! { "default_bcc", PREF_TYPE_STR, &preferences.default_bcc, }, ! { "default_cc", PREF_TYPE_STR, &preferences.default_cc, }, ! { "default_domain", PREF_TYPE_STR, &preferences.default_domain, }, ! { "default_mailbox", PREF_TYPE_STR, &preferences.default_mailbox, }, ! { "default_savebox", PREF_TYPE_STR, &preferences.default_savebox, }, ! { "developer_debug", PREF_TYPE_BOOL, &preferences.developer_debug, }, ! { "folder_path", PREF_TYPE_STR, &preferences.folder_path, }, ! { "header_set", PREF_TYPE_STR, &preferences.header_set, }, ! { "help_directory", PREF_TYPE_STR, &preferences.help_directory, }, ! { "hide_empty", PREF_TYPE_BOOL, &preferences.hide_empty, }, ! { "keepOnServer", PREF_TYPE_BOOL, &preferences.keepOnServer, }, ! { "keep_open", PREF_TYPE_BOOL, &preferences.keep_open, }, ! { "language", PREF_TYPE_STR, &preferences.language, }, ! { "log_full", PREF_TYPE_BOOL, &preferences.log_full, }, ! { "logit", PREF_TYPE_BOOL, &preferences.logit, }, ! { "mail_background", PREF_TYPE_INT, &preferences.mail_background, }, ! { "mail_fetch", PREF_TYPE_INT, &preferences.mail_fetch, }, ! { "mail_prefetch", PREF_TYPE_INT, &preferences.mail_prefetch, }, ! { "mail_sort", PREF_TYPE_STR, &preferences.mail_sort, }, ! { "mime_ask", PREF_TYPE_BOOL, &preferences.mime_ask, }, ! { "mime_directory", PREF_TYPE_STR, &preferences.mime_directory, }, ! { "newMailBeep", PREF_TYPE_BOOL, &preferences.newMailBeep, }, ! { "newMailProg", PREF_TYPE_STR, &preferences.newMailProg, }, ! { "news_background", PREF_TYPE_INT, &preferences.news_background, }, ! { "news_fetch", PREF_TYPE_INT, &preferences.news_fetch, }, ! { "news_prefetch", PREF_TYPE_INT, &preferences.news_prefetch, }, ! { "news_sort", PREF_TYPE_STR, &preferences.news_sort, }, ! { "nntp_server", PREF_TYPE_STR, &preferences.nntp_server, }, ! { "note_save", PREF_TYPE_INT, &preferences.note_save, }, ! { "print_command", PREF_TYPE_STR, &preferences.print_command, }, ! { "reply_address", PREF_TYPE_STR, &preferences.reply_address, }, ! { "send_eight", PREF_TYPE_BOOL, &preferences.send_eight, }, ! { "sendlog", PREF_TYPE_STR, &preferences.sendlog, }, ! { "showLog", PREF_TYPE_BOOL, &preferences.showLog, }, ! { "signature_file", PREF_TYPE_STR, &preferences.signature_file, }, ! { "smtp_debug", PREF_TYPE_BOOL, &preferences.smtp_debug, }, ! { "smtp_server", PREF_TYPE_STR, &preferences.smtp_server, }, ! { "tear_off", PREF_TYPE_BOOL, &preferences.tear_off, }, ! { "textInReply", PREF_TYPE_BOOL, &preferences.textInReply, }, ! { "url_command", PREF_TYPE_STR, &preferences.url_command, }, ! { "useIspell", PREF_TYPE_BOOL, &preferences.useIspell, }, ! { "viewline_format", PREF_TYPE_STR, &preferences.viewline_format, }, ! { "word_wrap", PREF_TYPE_BOOL, &preferences.word_wrap, }, ! }; Index: ml/src/preferences.h diff -c ml/src/preferences.h:1.2 ml/src/preferences.h:1.3 *** ml/src/preferences.h:1.2 Wed Oct 8 02:00:50 1997 --- ml/src/preferences.h Wed Oct 8 23:45:58 1997 *************** *** 6,75 **** typedef struct _PREFERENCES_ { char *defaultConfig; ! char *smtp_server; ! char *nntp_server; char *default_domain; char *default_mailbox; - char *default_savebox; char *default_mailbox_pattern; ! char *default_file_pattern; ! char *default_cc; ! char *default_bcc; ! char *default_action; ! char *help_directory; char *header_set; ! char *viewline_format; ! char *sendlog; char *mime_directory; char *reply_address; char *reply_prefix; ! char *print_command; char *signature_file; - char *folder_path; - char *url_command; - char *newMailProg; - char *mail_sort; - char *news_sort; - char *charset; - char *language; - char *ispellCommand; char *smart_reply; ! char *netCheckCommand; ! char *netStartCommand; ! char *netStopCommand; ! int netCheckDelay; int check_interval; - int mail_prefetch; - int news_prefetch; int mail_background; - int news_background; int mail_fetch; int news_fetch; int note_save; ! Boolean confirmDestroy; ! Boolean useIspell; ! Boolean imap_debug; ! Boolean smtp_debug; Boolean auto_open; ! Boolean word_wrap; ! Boolean mime_ask; ! Boolean logit; ! Boolean log_full; ! Boolean tear_off; Boolean decode_all; - Boolean hide_empty; - Boolean new_news; - Boolean send_eight; Boolean developer_debug; ! Boolean alert_new; Boolean keep_open; Boolean newMailBeep; ! Boolean keepOnServer; ! Boolean autoPlace; Boolean showLog; ! Boolean authLogin; ! Boolean addsig; /* Don't mess with these. */ Boolean local_defs; --- 6,78 ---- typedef struct _PREFERENCES_ { + char *charset; char *defaultConfig; ! char *default_action; ! char *default_bcc; ! char *default_cc; char *default_domain; + char *default_file_pattern; char *default_mailbox; char *default_mailbox_pattern; ! char *default_savebox; ! char *folder_path; char *header_set; ! char *help_directory; ! char *ispellCommand; ! char *language; ! char *mail_sort; char *mime_directory; + char *netCheckCommand; + char *netStartCommand; + char *netStopCommand; + char *newMailProg; + char *news_sort; + char *nntp_server; + char *print_command; char *reply_address; char *reply_prefix; ! char *sendlog; char *signature_file; char *smart_reply; ! char *smtp_server; ! char *url_command; ! char *viewline_format; ! int check_interval; int mail_background; int mail_fetch; + int mail_prefetch; + int netCheckDelay; + int news_background; int news_fetch; + int news_prefetch; int note_save; ! ! Boolean addsig; ! Boolean alert_new; ! Boolean authLogin; ! Boolean autoPlace; Boolean auto_open; ! Boolean confirmDestroy; Boolean decode_all; Boolean developer_debug; ! Boolean hide_empty; ! Boolean imap_debug; ! Boolean keepOnServer; Boolean keep_open; + Boolean log_full; + Boolean logit; + Boolean mime_ask; Boolean newMailBeep; ! Boolean new_news; ! Boolean send_eight; Boolean showLog; ! Boolean smtp_debug; ! Boolean tear_off; ! Boolean textInReply; ! Boolean useIspell; ! Boolean word_wrap; /* Don't mess with these. */ Boolean local_defs; Index: ml/src/prototypes.h diff -c ml/src/prototypes.h:1.2 ml/src/prototypes.h:1.3 *** ml/src/prototypes.h:1.2 Wed Oct 8 02:00:51 1997 --- ml/src/prototypes.h Wed Oct 8 23:45:59 1997 *************** *** 690,695 **** --- 690,702 ---- extern void cwin_verbose(); #endif #ifdef __STDC__ + extern void cwin_textInReply(Widget w,MLCompose *compose, + XmToggleButtonCallbackStruct *xp) + ; + #else + extern void cwin_textInReply(); + #endif + #ifdef __STDC__ extern void cwin_addsig(Widget w,MLCompose *compose, XmToggleButtonCallbackStruct *xp) ; Index: ml/src/resources.c diff -c ml/src/resources.c:1.2 ml/src/resources.c:1.3 *** ml/src/resources.c:1.2 Wed Oct 8 02:00:55 1997 --- ml/src/resources.c Wed Oct 8 23:46:00 1997 *************** *** 417,422 **** --- 417,423 ---- "*composeOptions*prefix_textfld.columns: 40", "*composeOptions*verbose_toggle.labelString: Verbose Delivery", "*composeOptions*add_sig.labelString: Add Signature", + "*composeOptions*textInReply.labelString: Text in Reply", "*composeOptions*keep_open_toggle.labelString: Keep Window Open", "*composeOptions*send_eight_toggle.labelString: 8-bit Transport", "*composeOptions*word_wrap_toggle.labelString: Word Wrap Editor", Index: ml/src/structures.h diff -c ml/src/structures.h:1.2 ml/src/structures.h:1.3 *** ml/src/structures.h:1.2 Wed Oct 8 02:00:56 1997 --- ml/src/structures.h Wed Oct 8 23:46:01 1997 *************** *** 624,651 **** typedef struct _ML_COMPOSE_OPTIONS_WINDOW_ { ! Tool shell; Tool form; ! Tool menubar; Tool mailhost; Tool nntphost; - Tool domain; - Tool replyto; - Tool sigfile; Tool outlog; - Tool charset; - Tool language; - Tool defcc; - Tool defbcc; Tool prefix; Tool rowcol; - Tool verbose; - Tool addsig; - Tool keep_open; Tool send_eight; Tool word_wrap; - Tool message_log; - Tool log_attachments; ButtonList *buttonlist; Boolean is_realized; --- 624,652 ---- typedef struct _ML_COMPOSE_OPTIONS_WINDOW_ { ! Tool addsig; ! Tool charset; ! Tool defbcc; ! Tool defcc; ! Tool domain; Tool form; ! Tool keep_open; ! Tool language; ! Tool log_attachments; Tool mailhost; + Tool menubar; + Tool message_log; Tool nntphost; Tool outlog; Tool prefix; + Tool replyto; Tool rowcol; Tool send_eight; + Tool shell; + Tool sigfile; + Tool textInReply; + Tool verbose; Tool word_wrap; ButtonList *buttonlist; Boolean is_realized; *************** *** 660,689 **** Boolean addsig; Boolean addsig_tmp; - Boolean verbose; - Boolean verbose_tmp; Boolean keep_open; Boolean keep_open_tmp; Boolean send_eight; Boolean send_eight_tmp; Boolean word_wrap; Boolean word_wrap_tmp; - Boolean message_log; - Boolean message_log_tmp; - Boolean log_attachments; - Boolean log_attachments_tmp; char *mailhost; char *nntphost; - char *domain; - char *replyto; - char *sigfile; char *outlog; - char *defcc; - char *defbcc; - char *charset; - char *language; char *prefix; } MLComposeOptions; --- 661,692 ---- Boolean addsig; Boolean addsig_tmp; Boolean keep_open; Boolean keep_open_tmp; + Boolean log_attachments; + Boolean log_attachments_tmp; + Boolean message_log; + Boolean message_log_tmp; Boolean send_eight; Boolean send_eight_tmp; + Boolean textInReply; + Boolean textInReply_tmp; + Boolean verbose; + Boolean verbose_tmp; Boolean word_wrap; Boolean word_wrap_tmp; + char *charset; + char *defbcc; + char *defcc; + char *domain; + char *language; char *mailhost; char *nntphost; char *outlog; char *prefix; + char *replyto; + char *sigfile; } MLComposeOptions;