Author: qboosh Date: Sat Apr 7 16:15:52 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated vvv.nntp patch (also adjusted for sidebar patch and disabled default keys changes), apply it as the last (it's conditional and needs conflict resolving)
---- Files affected: packages/mutt: mutt-vvv.nntp.patch (1.13 -> 1.14) , mutt.spec (1.246 -> 1.247) ---- Diffs: ================================================================ Index: packages/mutt/mutt-vvv.nntp.patch diff -u packages/mutt/mutt-vvv.nntp.patch:1.13 packages/mutt/mutt-vvv.nntp.patch:1.14 --- packages/mutt/mutt-vvv.nntp.patch:1.13 Wed Oct 6 19:59:14 2010 +++ packages/mutt/mutt-vvv.nntp.patch Sat Apr 7 18:15:47 2012 @@ -9,10 +9,22 @@ Vsevolod Volkov <[email protected]> -diff -udprP mutt-1.5.19.orig/ChangeLog.nntp mutt-1.5.19/ChangeLog.nntp ---- mutt-1.5.19.orig/ChangeLog.nntp 1970-01-01 03:00:00.000000000 +0300 -+++ mutt-1.5.19/ChangeLog.nntp 2009-01-06 22:27:38.000000000 +0200 -@@ -0,0 +1,363 @@ +diff -udprP mutt-1.5.21.orig/ChangeLog.nntp mutt-1.5.21/ChangeLog.nntp +--- mutt-1.5.21.orig/ChangeLog.nntp 1970-01-01 03:00:00.000000000 +0300 ++++ mutt-1.5.21/ChangeLog.nntp 2010-09-16 13:14:39.000000000 +0300 +@@ -0,0 +1,375 @@ ++* Wed Sep 16 2010 Vsevolod Volkov <[email protected]> ++- update to 1.5.21 ++ ++* Thu Aug 13 2009 Vsevolod Volkov <[email protected]> ++- fixed writting references in nntp_save_cache_group() ++ ++* Tue Jun 15 2009 Vsevolod Volkov <[email protected]> ++- update to 1.5.20 ++ ++* Tue Mar 20 2009 Vsevolod Volkov <[email protected]> ++- save Date: header of recorded outgoing articles ++ +* Tue Jan 6 2009 Vsevolod Volkov <[email protected]> +- update to 1.5.19 + @@ -376,9 +388,9 @@ + +* Fri Jan 28 2000 Vsevolod Volkov <[email protected]> +- update to 1.1.2 -diff -udprP mutt-1.5.19.orig/OPS mutt-1.5.19/OPS ---- mutt-1.5.19.orig/OPS 2008-03-19 22:07:57.000000000 +0200 -+++ mutt-1.5.19/OPS 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/OPS mutt-1.5.21/OPS +--- mutt-1.5.21.orig/OPS 2010-03-01 19:56:19.000000000 +0200 ++++ mutt-1.5.21/OPS 2010-09-16 13:14:39.000000000 +0300 @@ -8,14 +8,16 @@ OP_BOUNCE_MESSAGE "remail a message to a OP_BROWSER_NEW_FILE "select a new file in this directory" OP_BROWSER_VIEW_FILE "view file" @@ -438,7 +450,7 @@ OP_MAIN_CLEAR_FLAG "clear a status flag from a message" OP_MAIN_DELETE_PATTERN "delete messages matching a pattern" OP_MAIN_IMAP_FETCH "force retrieval of mail from IMAP server" -@@ -137,6 +150,7 @@ OP_PAGER_HIDE_QUOTED "toggle display of +@@ -138,6 +151,7 @@ OP_PAGER_HIDE_QUOTED "toggle display of OP_PAGER_SKIP_QUOTED "skip beyond quoted text" OP_PAGER_TOP "jump to the top of the message" OP_PIPE "pipe message/attachment to a shell command" @@ -446,7 +458,7 @@ OP_PREV_ENTRY "move to the previous entry" OP_PREV_LINE "scroll up one line" OP_PREV_PAGE "move to the previous page" -@@ -145,6 +159,7 @@ OP_QUERY "query external program for add +@@ -146,6 +160,7 @@ OP_QUERY "query external program for add OP_QUERY_APPEND "append new query results to current results" OP_QUIT "save changes to mailbox and quit" OP_RECALL_MESSAGE "recall a postponed message" @@ -454,7 +466,7 @@ OP_REDRAW "clear and redraw the screen" OP_REFORMAT_WINCH "{internal}" OP_RENAME_MAILBOX "rename the current mailbox (IMAP only)" -@@ -159,18 +174,22 @@ OP_SEARCH_TOGGLE "toggle search pattern +@@ -160,18 +175,22 @@ OP_SEARCH_TOGGLE "toggle search pattern OP_SHELL_ESCAPE "invoke a command in a subshell" OP_SORT "sort messages" OP_SORT_REVERSE "sort messages in reverse order" @@ -477,14 +489,14 @@ OP_VERSION "show the Mutt version number and date" OP_VIEW_ATTACH "view attachment using mailcap entry if necessary" OP_VIEW_ATTACHMENTS "show MIME attachments" -diff -udprP mutt-1.5.19.orig/PATCHES mutt-1.5.19/PATCHES ---- mutt-1.5.19.orig/PATCHES 2008-03-19 22:07:06.000000000 +0200 -+++ mutt-1.5.19/PATCHES 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/PATCHES mutt-1.5.21/PATCHES +--- mutt-1.5.21.orig/PATCHES 2008-03-19 22:07:06.000000000 +0200 ++++ mutt-1.5.21/PATCHES 2010-09-16 13:14:39.000000000 +0300 @@ -0,0 +1 @@ +vvv.nntp -diff -udprP mutt-1.5.19.orig/account.c mutt-1.5.19/account.c ---- mutt-1.5.19.orig/account.c 2008-10-30 02:30:17.000000000 +0200 -+++ mutt-1.5.19/account.c 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/account.c mutt-1.5.21/account.c +--- mutt-1.5.21.orig/account.c 2009-08-25 22:08:52.000000000 +0300 ++++ mutt-1.5.21/account.c 2010-09-16 13:14:39.000000000 +0300 @@ -51,6 +51,11 @@ int mutt_account_match (const ACCOUNT* a user = PopUser; #endif @@ -522,10 +534,10 @@ + else if ((account->type == M_ACCT_TYPE_NNTP) && NntpUser) + strfcpy (account->user, NntpUser, sizeof (account->user)); +#endif + else if (option (OPTNOCURSES)) + return -1; /* prompt (defaults to unix username), copy into account->user */ - else - { -@@ -215,6 +234,10 @@ int mutt_account_getpass (ACCOUNT* accou +@@ -217,6 +236,10 @@ int mutt_account_getpass (ACCOUNT* accou else if ((account->type == M_ACCT_TYPE_SMTP) && SmtpPass) strfcpy (account->pass, SmtpPass, sizeof (account->pass)); #endif @@ -533,12 +545,12 @@ + else if ((account->type == M_ACCT_TYPE_NNTP) && NntpPass) + strfcpy (account->pass, NntpPass, sizeof (account->pass)); +#endif + else if (option (OPTNOCURSES)) + return -1; else - { - snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "), -diff -udprP mutt-1.5.19.orig/account.h mutt-1.5.19/account.h ---- mutt-1.5.19.orig/account.h 2008-03-19 22:07:06.000000000 +0200 -+++ mutt-1.5.19/account.h 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/account.h mutt-1.5.21/account.h +--- mutt-1.5.21.orig/account.h 2008-03-19 22:07:06.000000000 +0200 ++++ mutt-1.5.21/account.h 2010-09-16 13:14:39.000000000 +0300 @@ -29,7 +29,8 @@ enum M_ACCT_TYPE_NONE = 0, M_ACCT_TYPE_IMAP, @@ -549,9 +561,9 @@ }; /* account flags */ -diff -udprP mutt-1.5.19.orig/attach.h mutt-1.5.19/attach.h ---- mutt-1.5.19.orig/attach.h 2008-03-19 22:07:06.000000000 +0200 -+++ mutt-1.5.19/attach.h 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/attach.h mutt-1.5.21/attach.h +--- mutt-1.5.21.orig/attach.h 2008-03-19 22:07:06.000000000 +0200 ++++ mutt-1.5.21/attach.h 2010-09-16 13:14:39.000000000 +0300 @@ -50,7 +50,7 @@ void mutt_print_attachment_list (FILE *f void mutt_attach_bounce (FILE *, HEADER *, ATTACHPTR **, short, BODY *); @@ -561,9 +573,9 @@ void mutt_attach_reply (FILE *, HEADER *, ATTACHPTR **, short, BODY *, int); #endif /* _ATTACH_H_ */ -diff -udprP mutt-1.5.19.orig/browser.c mutt-1.5.19/browser.c ---- mutt-1.5.19.orig/browser.c 2009-01-06 01:36:28.000000000 +0200 -+++ mutt-1.5.19/browser.c 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/browser.c mutt-1.5.21/browser.c +--- mutt-1.5.21.orig/browser.c 2010-08-25 19:31:40.000000000 +0300 ++++ mutt-1.5.21/browser.c 2010-09-16 13:14:39.000000000 +0300 @@ -32,6 +32,9 @@ #ifdef USE_IMAP #include "imap.h" @@ -574,8 +586,8 @@ #include <stdlib.h> #include <dirent.h> -@@ -49,6 +52,19 @@ static struct mapping_t FolderHelp[] = { - { NULL } +@@ -50,6 +53,19 @@ static struct mapping_t FolderHelp[] = { + { NULL, 0 } }; +#ifdef USE_NNTP @@ -594,7 +606,7 @@ typedef struct folder_t { struct folder_file *ff; -@@ -114,9 +130,17 @@ static void browser_sort (struct browser +@@ -115,9 +131,17 @@ static void browser_sort (struct browser case SORT_ORDER: return; case SORT_DATE: @@ -612,7 +624,7 @@ f = browser_compare_size; break; case SORT_SUBJECT: -@@ -307,8 +331,106 @@ folder_format_str (char *dest, size_t de +@@ -324,8 +348,106 @@ folder_format_str (char *dest, size_t de return (src); } @@ -720,7 +732,7 @@ { if (state->entrylen == state->entrymax) { -@@ -337,6 +459,10 @@ static void add_folder (MUTTMENU *m, str +@@ -354,6 +476,10 @@ static void add_folder (MUTTMENU *m, str #ifdef USE_IMAP (state->entry)[state->entrylen].imap = 0; #endif @@ -731,7 +743,7 @@ (state->entrylen)++; } -@@ -352,9 +478,35 @@ static void init_state (struct browser_s +@@ -369,9 +495,35 @@ static void init_state (struct browser_s menu->data = state->entry; } @@ -767,7 +779,7 @@ struct stat s; DIR *dp; struct dirent *de; -@@ -415,17 +567,40 @@ static int examine_directory (MUTTMENU * +@@ -432,17 +584,40 @@ static int examine_directory (MUTTMENU * tmp = Incoming; while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; @@ -810,7 +822,7 @@ BUFFY *tmp = Incoming; #ifdef USE_IMAP struct mailbox_state mbox; -@@ -443,14 +618,21 @@ static int examine_mailboxes (MUTTMENU * +@@ -460,14 +635,21 @@ static int examine_mailboxes (MUTTMENU * if (mx_is_imap (tmp->path)) { imap_mailbox_state (tmp->path, &mbox); @@ -834,7 +846,7 @@ continue; } #endif -@@ -464,15 +646,20 @@ static int examine_mailboxes (MUTTMENU * +@@ -496,15 +678,20 @@ static int examine_mailboxes (MUTTMENU * strfcpy (buffer, NONULL(tmp->path), sizeof (buffer)); mutt_pretty_mailbox (buffer, sizeof (buffer)); @@ -856,7 +868,7 @@ return (regexec (re, ((struct folder_file *) menu->data)[n].name, 0, NULL, 0)); } -@@ -483,6 +670,12 @@ static void folder_entry (char *s, size_ +@@ -515,6 +702,12 @@ static void folder_entry (char *s, size_ folder.ff = &((struct folder_file *) menu->data)[num]; folder.num = num; @@ -869,7 +881,7 @@ mutt_FormatString (s, slen, 0, NONULL(FolderFormat), folder_format_str, (unsigned long) &folder, M_FORMAT_ARROWCURSOR); } -@@ -503,6 +696,17 @@ static void init_menu (struct browser_st +@@ -535,6 +728,17 @@ static void init_menu (struct browser_st menu->tagged = 0; @@ -887,7 +899,7 @@ if (buffy) snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_buffy_check (0)); else -@@ -558,6 +762,31 @@ void _mutt_select_file (char *f, size_t +@@ -590,6 +794,31 @@ void _mutt_select_file (char *f, size_t if (!folder) strfcpy (LastDirBackup, LastDir, sizeof (LastDirBackup)); @@ -919,7 +931,7 @@ if (*f) { mutt_expand_path (f, flen); -@@ -654,6 +883,9 @@ void _mutt_select_file (char *f, size_t +@@ -686,6 +915,9 @@ void _mutt_select_file (char *f, size_t menu->tag = file_tag; menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER, @@ -929,7 +941,7 @@ FolderHelp); init_menu (&state, menu, title, sizeof (title), buffy); -@@ -792,7 +1024,11 @@ void _mutt_select_file (char *f, size_t +@@ -824,7 +1056,11 @@ void _mutt_select_file (char *f, size_t } } @@ -941,7 +953,7 @@ { strfcpy (f, state.entry[menu->current].name, flen); mutt_expand_path (f, flen); -@@ -850,14 +1086,6 @@ void _mutt_select_file (char *f, size_t +@@ -882,14 +1118,6 @@ void _mutt_select_file (char *f, size_t break; #ifdef USE_IMAP @@ -956,7 +968,7 @@ case OP_BROWSER_TOGGLE_LSUB: if (option (OPTIMAPLSUB)) unset_option (OPTIMAPLSUB); -@@ -958,6 +1186,11 @@ void _mutt_select_file (char *f, size_t +@@ -990,6 +1218,11 @@ void _mutt_select_file (char *f, size_t case OP_CHANGE_DIRECTORY: @@ -968,7 +980,7 @@ strfcpy (buf, LastDir, sizeof (buf)); #ifdef USE_IMAP if (!state.imap_browse) -@@ -1224,6 +1457,190 @@ void _mutt_select_file (char *f, size_t +@@ -1255,6 +1488,190 @@ void _mutt_select_file (char *f, size_t else mutt_error _("Error trying to view file"); } @@ -1159,9 +1171,9 @@ } } -diff -udprP mutt-1.5.19.orig/browser.h mutt-1.5.19/browser.h ---- mutt-1.5.19.orig/browser.h 2009-01-05 21:20:53.000000000 +0200 -+++ mutt-1.5.19/browser.h 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/browser.h mutt-1.5.21/browser.h +--- mutt-1.5.21.orig/browser.h 2009-01-05 21:20:53.000000000 +0200 ++++ mutt-1.5.21/browser.h 2010-09-16 13:14:39.000000000 +0300 @@ -19,6 +19,10 @@ #ifndef _BROWSER_H #define _BROWSER_H 1 @@ -1183,70 +1195,48 @@ unsigned tagged : 1; }; -diff -udprP mutt-1.5.19.orig/buffy.c mutt-1.5.19/buffy.c ---- mutt-1.5.19.orig/buffy.c 2008-08-30 02:39:48.000000000 +0300 -+++ mutt-1.5.19/buffy.c 2009-01-06 22:27:38.000000000 +0200 -@@ -285,6 +285,9 @@ int mutt_buffy_check (int force) - #ifdef USE_POP - if (!Context || Context->magic != M_POP) - #endif +diff -udprP mutt-1.5.21.orig/buffy.c mutt-1.5.21/buffy.c +--- mutt-1.5.21.orig/buffy.c 2010-09-13 20:19:55.000000000 +0300 ++++ mutt-1.5.21/buffy.c 2010-09-16 13:14:39.000000000 +0300 +@@ -405,6 +405,9 @@ int mutt_buffy_check (int force) + + /* check device ID and serial number instead of comparing paths */ + if (!Context || Context->magic == M_IMAP || Context->magic == M_POP +#ifdef USE_NNTP -+ if (!Context || Context->magic != M_NNTP) ++ || Context->magic == M_NNTP +#endif - /* check device ID and serial number instead of comparing paths */ - if (!Context || !Context->path || stat (Context->path, &contex_sb) != 0) + || stat (Context->path, &contex_sb) != 0) { -@@ -308,6 +311,11 @@ int mutt_buffy_check (int force) - tmp->magic = M_POP; - else + contex_sb.st_dev=0; +@@ -421,6 +424,11 @@ int mutt_buffy_check (int force) + tmp->magic = M_POP; + else #endif +#ifdef USE_NNTP -+ if ((tmp->magic == M_NNTP) || mx_is_nntp (tmp->path)) -+ tmp->magic = M_NNTP; -+ else ++ if ((tmp->magic == M_NNTP) || mx_is_nntp (tmp->path)) ++ tmp->magic = M_NNTP; ++ else +#endif - if (stat (tmp->path, &sb) != 0 || (S_ISREG(sb.st_mode) && sb.st_size == 0) || - (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0)) - { -@@ -325,25 +333,21 @@ int mutt_buffy_check (int force) + if (stat (tmp->path, &sb) != 0 || (S_ISREG(sb.st_mode) && sb.st_size == 0) || + (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0)) + { +@@ -436,8 +444,11 @@ int mutt_buffy_check (int force) /* check to see if the folder is the currently selected folder * before polling */ if (!Context || !Context->path || --#if defined USE_IMAP || defined USE_POP -- (( -+ ( -+ (0 - #ifdef USE_IMAP -- tmp->magic == M_IMAP -+ || tmp->magic == M_IMAP - #endif - #ifdef USE_POP --#ifdef USE_IMAP -- || --#endif -- tmp->magic == M_POP --#endif -- ) ? mutt_strcmp (tmp->path, Context->path) : -+ || tmp->magic == M_POP - #endif -- (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino) --#if defined USE_IMAP || defined USE_POP -- ) +- (( tmp->magic == M_IMAP || tmp->magic == M_POP ) +- ? mutt_strcmp (tmp->path, Context->path) : ++ (( tmp->magic == M_IMAP || tmp->magic == M_POP +#ifdef USE_NNTP + || tmp->magic == M_NNTP - #endif -- ) -- -+ ) ? mutt_strcmp (tmp->path, Context->path) : -+ (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino) -+ ) -+ ) ++#endif ++ ) ? mutt_strcmp (tmp->path, Context->path) : + (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino))) { switch (tmp->magic) - { -diff -udprP mutt-1.5.19.orig/complete.c mutt-1.5.19/complete.c ---- mutt-1.5.19.orig/complete.c 2009-01-05 21:20:53.000000000 +0200 -+++ mutt-1.5.19/complete.c 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/complete.c mutt-1.5.21/complete.c +--- mutt-1.5.21.orig/complete.c 2009-01-05 21:20:53.000000000 +0200 ++++ mutt-1.5.21/complete.c 2010-09-16 13:14:39.000000000 +0300 @@ -25,6 +25,9 @@ #include "mailbox.h" #include "imap.h" @@ -1329,9 +1319,9 @@ /* we can use '/' as a delimiter, imap_complete rewrites it */ if (*s == '=' || *s == '+' || *s == '!') { -diff -udprP mutt-1.5.19.orig/compose.c mutt-1.5.19/compose.c ---- mutt-1.5.19.orig/compose.c 2009-01-05 21:20:53.000000000 +0200 -+++ mutt-1.5.19/compose.c 2009-01-06 22:27:38.000000000 +0200 +diff -udprP mutt-1.5.21.orig/compose.c mutt-1.5.21/compose.c +--- mutt-1.5.21.orig/compose.c 2010-04-14 21:50:19.000000000 +0300 ++++ mutt-1.5.21/compose.c 2010-09-16 13:14:39.000000000 +0300 @@ -32,10 +32,15 @@ #include "mailbox.h" #include "sort.h" @@ -1348,7 +1338,7 @@ #include <errno.h> #include <string.h> -@@ -67,11 +69,17 @@ enum +@@ -67,11 +72,17 @@ enum HDR_CRYPT, HDR_CRYPTINFO, @@ -1365,10 +1355,10 @@ -#define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */ +#define HDR_XOFFSET 14 +#define TITLE_FMT "%14s" /* Used for Prompts, which are ASCII */ - #define W (COLS - HDR_XOFFSET) + #define W (COLS - HDR_XOFFSET - SidebarWidth) static char *Prompts[] = -@@ -83,6 +91,16 @@ static char *Prompts[] = +@@ -83,6 +94,16 @@ static char *Prompts[] = "Subject: ", "Reply-To: ", "Fcc: " @@ -1385,8 +1375,8 @@ }; static struct mapping_t ComposeHelp[] = { -@@ -97,6 +115,19 @@ static struct mapping_t ComposeHelp[] = - { NULL } +@@ -97,6 +118,19 @@ static struct mapping_t ComposeHelp[] = + { NULL, 0 } }; +#ifdef USE_NNTP @@ -1405,29 +1395,44 @@ static void snd_entry (char *b, size_t blen, MUTTMENU *menu, int num) { mutt_FormatString (b, blen, 0, NONULL (AttachFormat), mutt_attach_fmt, -@@ -115,16 +146,16 @@ static void redraw_crypt_lines (HEADER * - if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME)) - { - if (!msg->security) -- mvaddstr (HDR_CRYPT, 0, "Security: "); -+ mvaddstr (HDR_CRYPT, 0, " Security: "); - else if (msg->security & APPLICATION_SMIME) -- mvaddstr (HDR_CRYPT, 0, " S/MIME: "); -+ mvaddstr (HDR_CRYPT, 0, " S/MIME: "); - else if (msg->security & APPLICATION_PGP) -- mvaddstr (HDR_CRYPT, 0, " PGP: "); -+ mvaddstr (HDR_CRYPT, 0, " PGP: "); +@@ -112,7 +146,7 @@ static void redraw_crypt_lines (HEADER * + { + int off = 0; + +- mvaddstr (HDR_CRYPT, SidebarWidth, "Security: "); ++ mvprintw (HDR_CRYPT, SidebarWidth, TITLE_FMT, "Security: "); + + if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) + { +@@ -148,12 +182,15 @@ static void redraw_crypt_lines (HEADER * + clrtoeol (); + + if ((WithCrypto & APPLICATION_PGP) +- && msg->security & APPLICATION_PGP && msg->security & SIGN) +- printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("<default>")); ++ && msg->security & APPLICATION_PGP && msg->security & SIGN) { ++ printw (TITLE_FMT, _(" sign as: ")); ++ printw ("%s", PgpSignAs ? PgpSignAs : _("<default>")); ++ } + + if ((WithCrypto & APPLICATION_SMIME) + && msg->security & APPLICATION_SMIME && msg->security & SIGN) { +- printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>")); ++ printw (TITLE_FMT, _(" sign as: ")); ++ printw ("%s", SmimeDefaultKey ? SmimeDefaultKey : _("<default>")); } - else if ((WithCrypto & APPLICATION_SMIME)) -- mvaddstr (HDR_CRYPT, 0, " S/MIME: "); -+ mvaddstr (HDR_CRYPT, 0, " S/MIME: "); - else if ((WithCrypto & APPLICATION_PGP)) -- mvaddstr (HDR_CRYPT, 0, " PGP: "); -+ mvaddstr (HDR_CRYPT, 0, " PGP: "); - else - return; -@@ -252,9 +283,28 @@ static void draw_envelope_addr (int line + if ((WithCrypto & APPLICATION_SMIME) +@@ -175,7 +212,7 @@ static void redraw_mix_line (LIST *chain + int c; + char *t; + +- mvaddstr (HDR_MIX, SidebarWidth, " Mix: "); ++ mvprintw (HDR_MIX, SidebarWidth, TITLE_FMT, "Mix: "); + + if (!chain) + { +@@ -249,9 +286,28 @@ static void draw_envelope_addr (int line static void draw_envelope (HEADER *msg, char *fcc) { draw_envelope_addr (HDR_FROM, msg->env->from); @@ -1442,21 +1447,21 @@ + } + else + { -+ mvprintw (HDR_TO, 0, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]); ++ mvprintw (HDR_TO, SidebarWidth, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]); + mutt_paddstr (W, NONULL (msg->env->newsgroups)); -+ mvprintw (HDR_CC, 0, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]); ++ mvprintw (HDR_CC, SidebarWidth, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]); + mutt_paddstr (W, NONULL (msg->env->followup_to)); + if (option (OPTXCOMMENTTO)) + { -+ mvprintw (HDR_BCC, 0, TITLE_FMT , Prompts[HDR_XCOMMENTTO - 1]); ++ mvprintw (HDR_BCC, SidebarWidth, TITLE_FMT , Prompts[HDR_XCOMMENTTO - 1]); + mutt_paddstr (W, NONULL (msg->env->x_comment_to)); + } + } +#endif - mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); + mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); mutt_paddstr (W, NONULL (msg->env->subject)); draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to); -@@ -507,6 +557,12 @@ int mutt_compose_menu (HEADER *msg, /* +@@ -504,6 +560,12 @@ int mutt_compose_menu (HEADER *msg, /* /* Sort, SortAux could be changed in mutt_index_menu() */ int oldSort, oldSortAux; struct stat st; @@ -1469,7 +1474,7 @@ mutt_attach_init (msg->content); idx = mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0, 1); -@@ -517,10 +573,18 @@ int mutt_compose_menu (HEADER *msg, /* +@@ -514,10 +576,18 @@ int mutt_compose_menu (HEADER *msg, /* menu->make_entry = snd_entry; menu->tag = mutt_tag_attach; menu->data = idx; @@ -1488,7 +1493,7 @@ switch (op = mutt_menuLoop (menu)) { case OP_REDRAW: -@@ -533,17 +597,87 @@ int mutt_compose_menu (HEADER *msg, /* +@@ -530,17 +600,87 @@ int mutt_compose_menu (HEADER *msg, /* mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_TO: @@ -1576,7 +1581,7 @@ case OP_COMPOSE_EDIT_SUBJECT: if (msg->env->subject) strfcpy (buf, msg->env->subject, sizeof (buf)); -@@ -706,6 +840,9 @@ int mutt_compose_menu (HEADER *msg, /* +@@ -703,6 +843,9 @@ int mutt_compose_menu (HEADER *msg, /* break; case OP_COMPOSE_ATTACH_MESSAGE: @@ -1586,7 +1591,7 @@ { char *prompt; HEADER *h; -@@ -713,7 +850,22 @@ int mutt_compose_menu (HEADER *msg, /* +@@ -710,7 +853,22 @@ int mutt_compose_menu (HEADER *msg, /* fname[0] = 0; prompt = _("Open mailbox to attach message from"); @@ -1609,7 +1614,7 @@ { strfcpy (fname, NONULL (Context->path), sizeof (fname)); mutt_pretty_mailbox (fname, sizeof (fname)); -@@ -722,6 +874,11 @@ int mutt_compose_menu (HEADER *msg, /* +@@ -719,6 +877,11 @@ int mutt_compose_menu (HEADER *msg, /* if (mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, 1) == -1 || !fname[0]) break; @@ -1621,7 +1626,7 @@ mutt_expand_path (fname, sizeof (fname)); #ifdef USE_IMAP <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/packages/mutt/mutt-vvv.nntp.patch?r1=1.13&r2=1.14 http://cvs.pld-linux.org/packages/mutt/mutt.spec?r1=1.246&r2=1.247 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
