----------------------------------------------------------------------------- MANIFEST | 40 ++++++++++++++++++++-------------------- Makefile | 4 ++-- configure | 2 +- configure.in | 2 +- doc/CHANGES | 10 ++++++++++ doc/TODO | 4 ---- doc/tin.1 | 2 +- doc/tin.5 | 2 +- include/proto.h | 4 ++-- include/version.h | 4 ++-- po/de.gmo |binary po/de.po | 8 ++++---- po/en_GB.gmo |binary po/en_GB.po | 6 +++--- po/et.gmo |binary po/et.po | 9 +++++---- po/fr.gmo |binary po/fr.po | 8 ++++---- po/messages |binary po/tin.pot | 8 +++++--- src/feed.c | 4 ++-- src/lang.c | 2 +- src/nntplib.c | 4 ++-- src/page.c | 13 +++++-------- src/post.c | 7 ++++--- 25 files changed, 75 insertions, 68 deletions ----------------------------------------------------------------------------- diff -Nurp tin-1.6.1/MANIFEST tin-1.7.0/MANIFEST --- tin-1.6.1/MANIFEST Sun Aug 10 14:54:18 2003 +++ tin-1.7.0/MANIFEST Sun Aug 10 16:31:04 2003 @@ -1,4 +1,4 @@ -MANIFEST for tin-1.6.1 (Sun Aug 10 14:54:18 CEST 2003) +MANIFEST for tin-1.7.0 (Sun Aug 10 16:31:04 CEST 2003) ---------------------------------------------------- 13085 ./Makefile 7531 ./MANIFEST @@ -16,11 +16,11 @@ MANIFEST for tin-1.6.1 (Sun Aug 10 14:54 777 ./mkdirs.sh 1505 ./tin.spec 18847 ./doc/ABOUT-NLS - 2296 ./doc/CHANGES + 2574 ./doc/CHANGES 226345 ./doc/CHANGES.old 1469 ./doc/DEBUG_REFS 29430 ./doc/INSTALL - 31380 ./doc/TODO + 31189 ./doc/TODO 3302 ./doc/WHATSNEW 2617 ./doc/art_handling.txt 3862 ./doc/auth.txt @@ -67,7 +67,7 @@ MANIFEST for tin-1.6.1 (Sun Aug 10 14:54 6539 ./include/nntplib.h 665 ./include/plp_snprintf.h 11836 ./include/policy.h - 29869 ./include/proto.h + 29898 ./include/proto.h 5047 ./include/rfc2046.h 3373 ./include/stpwatch.h 5400 ./include/tcurses.h @@ -75,7 +75,7 @@ MANIFEST for tin-1.6.1 (Sun Aug 10 14:54 12814 ./include/tinrc.h 5736 ./include/tnntp.h 2256 ./include/trace.h - 2686 ./include/version.h + 2685 ./include/version.h 24977 ./src/active.c 50476 ./src/art.c 30113 ./src/attrib.c @@ -87,7 +87,7 @@ MANIFEST for tin-1.6.1 (Sun Aug 10 14:54 34665 ./src/curses.c 9928 ./src/debug.c 3414 ./src/envarg.c - 25208 ./src/feed.c + 25215 ./src/feed.c 52178 ./src/filter.c 17968 ./src/getline.c 7254 ./src/global.c @@ -99,7 +99,7 @@ MANIFEST for tin-1.6.1 (Sun Aug 10 14:54 31889 ./src/init.c 2845 ./src/joinpath.c 38017 ./src/keymap.c - 113887 ./src/lang.c + 113906 ./src/lang.c 4310 ./src/langinfo.c 7033 ./src/list.c 6672 ./src/lock.c @@ -110,14 +110,14 @@ MANIFEST for tin-1.6.1 (Sun Aug 10 14:54 5222 ./src/mimetypes.c 83791 ./src/misc.c 37475 ./src/newsrc.c - 27739 ./src/nntplib.c + 27755 ./src/nntplib.c 7248 ./src/nrctbl.c 26546 ./src/open.c - 55079 ./src/page.c + 55089 ./src/page.c 24132 ./src/parsdate.y 16966 ./src/plp_snprintf.c 12670 ./src/pgp.c - 130358 ./src/post.c + 130410 ./src/post.c 13850 ./src/prompt.c 10822 ./src/read.c 24976 ./src/refs.c @@ -281,13 +281,13 @@ MANIFEST for tin-1.6.1 (Sun Aug 10 14:54 41 ./intl/VERSION 4962 ./po/Makefile.inn 839 ./po/POTFILES.in - 120802 ./po/tin.pot - 164538 ./po/de.gmo - 195132 ./po/de.po - 7445 ./po/en_GB.gmo - 123327 ./po/en_GB.po - 157074 ./po/et.gmo - 187218 ./po/et.po - 104613 ./po/fr.gmo - 165617 ./po/fr.po -5913370 total + 120827 ./po/tin.pot + 164556 ./po/de.gmo + 195151 ./po/de.po + 7444 ./po/en_GB.gmo + 123346 ./po/en_GB.po + 156930 ./po/et.gmo + 187192 ./po/et.po + 104478 ./po/fr.gmo + 165579 ./po/fr.po +5913326 total diff -Nurp tin-1.6.1/Makefile tin-1.7.0/Makefile --- tin-1.6.1/Makefile Sun Aug 10 14:54:16 2003 +++ tin-1.7.0/Makefile Sun Aug 10 16:31:02 2003 @@ -6,8 +6,8 @@ PROJECT = tin LVER = 1 -PVER = 6 -SVER = 1 +PVER = 7 +SVER = 0 VER = $(LVER).$(PVER).$(SVER) DVER = 20030810 EXE = tin diff -Nurp tin-1.6.1/configure tin-1.7.0/configure --- tin-1.6.1/configure Sun Aug 10 14:54:18 2003 +++ tin-1.7.0/configure Sun Aug 10 16:31:04 2003 @@ -617,7 +617,7 @@ fi PACKAGE=tin -VERSION=1.6.1 +VERSION=1.7.0 cat >> confdefs.h < + BUG. refine txt_help_thread_mark_article_read + FIX. lang.c + + 007) Dirk Nimmich + BUG. attributes were ignored when mailing + FIX. proto.h, feed.c, post.c + -- 1.6.1 release 20030810 "Mingulay" -- 006) Darrell Tangman diff -Nurp tin-1.6.1/doc/TODO tin-1.7.0/doc/TODO --- tin-1.6.1/doc/TODO Tue Aug 5 12:27:20 2003 +++ tin-1.7.0/doc/TODO Sun Aug 10 15:31:41 2003 @@ -41,10 +41,6 @@ o better integrate saving of MIME/non-M [mostly done] [Jason Faultless ] -o attributes are ignored for mail-actions (except mail_to_author()) - cause mail_loop() usualy doesn't know the group we are in. - [20020211 Andreas Metzler ] - o reusing p'o'stponed articles in mailing_list groups doesn't work (possible fix: store Newsgroups (and other infos) via msg_add_header() (to overwrite any old values) in X-Tin-Postponed:-header and remove it diff -Nurp tin-1.6.1/doc/tin.1 tin-1.7.0/doc/tin.1 --- tin-1.6.1/doc/tin.1 Sun Aug 10 03:35:36 2003 +++ tin-1.7.0/doc/tin.1 Sun Aug 10 16:21:20 2003 @@ -9,7 +9,7 @@ .\" - document random organization feature .\" .\" -.TH tin 1 "August 10th, 2003" "1.6.1" "A Usenet newsreader" +.TH tin 1 "August 10th, 2003" "1.7.0" "A Usenet newsreader" .\" .\" .SH NAME diff -Nurp tin-1.6.1/doc/tin.5 tin-1.7.0/doc/tin.5 --- tin-1.6.1/doc/tin.5 Sun Aug 10 03:36:51 2003 +++ tin-1.7.0/doc/tin.5 Sun Aug 10 16:21:30 2003 @@ -5,7 +5,7 @@ .\" Updated : 2003-08-10 .\" Notes : needs a some work .\" -.TH tin 5 "August 10th, 2003" "1.6.1" "A Usenet newsreader" +.TH tin 5 "August 10th, 2003" "1.7.0" "A Usenet newsreader" .SH NAME tin, rtin \- related files diff -Nurp tin-1.6.1/include/proto.h tin-1.7.0/include/proto.h --- tin-1.6.1/include/proto.h Tue Jul 22 17:34:02 2003 +++ tin-1.7.0/include/proto.h Sun Aug 10 15:31:50 2003 @@ -3,7 +3,7 @@ * Module : proto.h * Author : Urs Janssen * Created : - * Updated : 2003-06-29 + * Updated : 2003-08-10 * Notes : * * Copyright (c) 1997-2003 Urs Janssen @@ -472,7 +472,7 @@ extern time_t parsedate(char *p, TIMEINF /* post.c */ extern int count_postponed_articles(void); extern int mail_to_author(const char *group, int respnum, t_bool copy_text, t_bool with_headers, t_bool raw_data); -extern int mail_to_someone(const char *address, t_bool confirm_to_mail, t_openartinfo *artinfo); +extern int mail_to_someone(const char *address, t_bool confirm_to_mail, t_openartinfo *artinfo, const struct t_group *group); extern int post_response(const char *group, int respnum, t_bool copy_text, t_bool with_headers, t_bool raw_data); extern int repost_article(const char *group, int respnum, t_bool supersede, t_openartinfo *artinfo); extern t_bool cancel_article(struct t_group *group, struct t_article *art, int respnum); diff -Nurp tin-1.6.1/include/version.h tin-1.7.0/include/version.h --- tin-1.6.1/include/version.h Sun Aug 10 14:54:16 2003 +++ tin-1.7.0/include/version.h Sun Aug 10 16:31:02 2003 @@ -40,10 +40,10 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "1.6.1" +# define VERSION "1.7.0" # endif /* !TIN_AUTOCONF_H */ # define RELEASEDATE "20030810" -# define RELEASENAME "Mingulay" +# define RELEASENAME "Sandray" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.6" # define ATTRIBUTES_VERSION "1.0.0" Binary files tin-1.6.1/po/de.gmo and tin-1.7.0/po/de.gmo differ diff -Nurp tin-1.6.1/po/de.po tin-1.7.0/po/de.po --- tin-1.6.1/po/de.po Sun Aug 10 14:53:40 2003 +++ tin-1.7.0/po/de.po Sun Aug 10 16:30:35 2003 @@ -5,8 +5,8 @@ # Christian Garbs , 2003 # msgid "" -msgstr "Project-Id-Version: tin 1.6.0\n" - "POT-Creation-Date: 2003-08-10 03:49+0200\n" +msgstr "Project-Id-Version: tin 1.7.0\n" + "POT-Creation-Date: 2003-08-10 16:30+0200\n" "PO-Revision-Date: 2003-03-13 04:15+0200\n" "Last-Translator: Sven Hartge , Kai Bojens " "\n" @@ -1739,7 +1739,7 @@ msgid "choose last article in list" msgstr "wähle letzten Artikel in der Liste" #: src/lang.c:408 -msgid "mark article as read and move cursor to next unread article" +msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "markiert Artikel als gelesen geht zum nächsten ungelesenen Artikel" #: src/lang.c:411 @@ -6258,7 +6258,7 @@ msgid "Posting: %.*s ..." msgstr "Poste: %.*s ..." #. TODO: -> lang.c -#: src/post.c:4037 +#: src/post.c:4038 #, c-format msgid "Rereading %s..." msgstr "Lese %s..." Binary files tin-1.6.1/po/en_GB.gmo and tin-1.7.0/po/en_GB.gmo differ diff -Nurp tin-1.6.1/po/en_GB.po tin-1.7.0/po/en_GB.po --- tin-1.6.1/po/en_GB.po Sun Aug 10 14:54:02 2003 +++ tin-1.7.0/po/en_GB.po Sun Aug 10 16:30:36 2003 @@ -3,7 +3,7 @@ # msgid "" msgstr "Project-Id-Version: tin 1.6.0\n" - "POT-Creation-Date: 2003-08-10 03:49+0200\n" + "POT-Creation-Date: 2003-08-10 16:30+0200\n" "PO-Revision-Date: 2002-11-15 20:10+0000\n" "Last-Translator: Robert Brady \n" "Language-Team: \n" @@ -1604,7 +1604,7 @@ msgid "choose last article in list" msgstr "" #: src/lang.c:408 -msgid "mark article as read and move cursor to next unread article" +msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "" #: src/lang.c:411 @@ -5808,7 +5808,7 @@ msgid "Posting: %.*s ..." msgstr "" #. TODO: -> lang.c -#: src/post.c:4037 +#: src/post.c:4038 #, c-format msgid "Rereading %s..." msgstr "" Binary files tin-1.6.1/po/et.gmo and tin-1.7.0/po/et.gmo differ diff -Nurp tin-1.6.1/po/et.po tin-1.7.0/po/et.po --- tin-1.6.1/po/et.po Sun Aug 10 03:52:20 2003 +++ tin-1.7.0/po/et.po Sun Aug 10 16:30:38 2003 @@ -4,7 +4,7 @@ # msgid "" msgstr "Project-Id-Version: tin 1.6.0\n" - "POT-Creation-Date: 2003-08-10 03:49+0200\n" + "POT-Creation-Date: 2003-08-10 16:30+0200\n" "PO-Revision-Date: 2003-07-15 11:07+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -1679,9 +1679,10 @@ msgstr "vali loendis esimene artikkel" msgid "choose last article in list" msgstr "vali loendis viimane artikkel" +# TRANSLATION MISSING #: src/lang.c:408 -msgid "mark article as read and move cursor to next unread article" -msgstr "märgi artikkel loetuks ja liigu edasi järgmisele lugemata artiklile" +msgid "mark article or tagged articles as read and move cursor to next unread article" +msgstr "" #: src/lang.c:411 msgid "Display properties\n" @@ -6193,7 +6194,7 @@ msgid "Posting: %.*s ..." msgstr "Postitan: %.*s ..." #. TODO: -> lang.c -#: src/post.c:4037 +#: src/post.c:4038 #, c-format msgid "Rereading %s..." msgstr "Loen %s uuesti..." Binary files tin-1.6.1/po/fr.gmo and tin-1.7.0/po/fr.gmo differ diff -Nurp tin-1.6.1/po/fr.po tin-1.7.0/po/fr.po --- tin-1.6.1/po/fr.po Sun Aug 10 14:53:51 2003 +++ tin-1.7.0/po/fr.po Sun Aug 10 16:30:39 2003 @@ -3,7 +3,7 @@ # msgid "" msgstr "Project-Id-Version: 1.6.0\n" - "POT-Creation-Date: 2003-08-10 03:49+0200\n" + "POT-Creation-Date: 2003-08-10 16:30+0200\n" "PO-Revision-Date: 2003-07-04 04:15+0200\n" "Last-Translator: Matt Anton \n" @@ -1659,8 +1659,8 @@ msgid "choose last article in list" msgstr "choisir le dernier article dans la liste" #: src/lang.c:408 -msgid "mark article as read and move cursor to next unread article" -msgstr "marquer article comme lu et voir l'article non lu suivant" +msgid "mark article or tagged articles as read and move cursor to next unread article" +msgstr "" #: src/lang.c:411 msgid "Display properties\n" @@ -6068,7 +6068,7 @@ msgstr "Postage : %.*s ..." # TRANSLATION MISSING #. TODO: -> lang.c -#: src/post.c:4037 +#: src/post.c:4038 #, c-format msgid "Rereading %s..." msgstr "" Binary files tin-1.6.1/po/messages and tin-1.7.0/po/messages differ diff -Nurp tin-1.6.1/po/tin.pot tin-1.7.0/po/tin.pot --- tin-1.6.1/po/tin.pot Sun Aug 10 03:49:58 2003 +++ tin-1.7.0/po/tin.pot Sun Aug 10 16:30:27 2003 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-08-10 03:49+0200\n" +"POT-Creation-Date: 2003-08-10 16:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1651,7 +1651,9 @@ msgid "choose last article in list" msgstr "" #: src/lang.c:408 -msgid "mark article as read and move cursor to next unread article" +msgid "" +"mark article or tagged articles as read and move cursor to next unread " +"article" msgstr "" #: src/lang.c:411 @@ -6019,7 +6021,7 @@ msgid "Posting: %.*s ..." msgstr "" #. TODO: -> lang.c -#: src/post.c:4037 +#: src/post.c:4038 #, c-format msgid "Rereading %s..." msgstr "" diff -Nurp tin-1.6.1/src/feed.c tin-1.7.0/src/feed.c --- tin-1.6.1/src/feed.c Sun Jul 20 12:48:06 2003 +++ tin-1.7.0/src/feed.c Sun Aug 10 15:32:00 2003 @@ -3,7 +3,7 @@ * Module : feed.c * Author : I. Lea * Created : 1991-08-31 - * Updated : 2003-07-19 + * Updated : 2003-08-10 * Notes : provides same interface to mail,pipe,print,save & repost commands * * Copyright (c) 1991-2003 Iain Lea @@ -408,7 +408,7 @@ feed_article( switch (function) { case FEED_MAIL: - switch (mail_to_someone(tinrc.default_mail_address, confirm, openartptr)) { + switch (mail_to_someone(tinrc.default_mail_address, confirm, openartptr, group)) { case POSTED_REDRAW: redraw_screen = TRUE; /* FALLTHROUGH */ diff -Nurp tin-1.6.1/src/lang.c tin-1.7.0/src/lang.c --- tin-1.6.1/src/lang.c Sun Aug 10 03:37:54 2003 +++ tin-1.7.0/src/lang.c Sun Aug 10 16:08:36 2003 @@ -405,7 +405,7 @@ constext txt_help_thread_catchup[] = N_( constext txt_help_thread_catchup_next_unread[] = N_("mark thread as read and enter next unread thread or group"); constext txt_help_thread_first_article[] = N_("choose first article in list"); constext txt_help_thread_last_article[] = N_("choose last article in list"); -constext txt_help_thread_mark_article_read[] = N_("mark article as read and move cursor to next unread article"); +constext txt_help_thread_mark_article_read[] = N_("mark article or tagged articles as read and move cursor to next unread article"); constext txt_help_thread_read_article[] = N_("read chosen article"); constext txt_help_thread_toggle_subj_display[] = N_("cycle the display of authors email address, real name, both or neither"); constext txt_help_title_disp[] = N_("Display properties\n------------------"); diff -Nurp tin-1.6.1/src/nntplib.c tin-1.7.0/src/nntplib.c --- tin-1.6.1/src/nntplib.c Sat Jul 12 15:49:46 2003 +++ tin-1.7.0/src/nntplib.c Sun Aug 10 15:09:41 2003 @@ -3,7 +3,7 @@ * Module : nntplib.c * Author : S. Barber & I. Lea * Created : 1991-01-12 - * Updated : 2003-06-29 + * Updated : 2003-08-10 * Notes : NNTP client routines taken from clientlib.c 1.5.11 (1991-02-10) * Copyright : (c) Copyright 1991-99 by Stan Barber & Iain Lea * Permission is hereby granted to copy, reproduce, redistribute @@ -114,7 +114,7 @@ getserverbyfile( char *new_env; static char *old_env = NULL; # endif /* !HAVE_SETENV && HAVE_PUTENV */ -#endif +#endif /* NNTP_ABLE */ if (!read_news_via_nntp) { STRCPY(buf, "local"); /* what if a server is named "local"? */ return buf; diff -Nurp tin-1.6.1/src/page.c tin-1.7.0/src/page.c --- tin-1.6.1/src/page.c Sun Aug 3 20:51:38 2003 +++ tin-1.7.0/src/page.c Sun Aug 10 15:10:12 2003 @@ -3,7 +3,7 @@ * Module : page.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-08-03 + * Updated : 2003-08-10 * Notes : * * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta @@ -1721,7 +1721,7 @@ toggle_raw( num_chars = wcswidth(wline, ARRAY_SIZE(wline) -1); is_illegal = FALSE; } else -#endif +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ { if (IS_LOCAL_CHARSET("Big5")) { char c; @@ -1749,11 +1749,9 @@ toggle_raw( * over several screen lines */ p = line; - while (*p) - { - int space; + while (*p) { + int space = cCOLS; - space = cCOLS; while ((space > 0) && *p) { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (!is_illegal) { @@ -1781,8 +1779,7 @@ toggle_raw( if (*p) { pgart.rawl[j].offset = offset; pgart.rawl[j].flags = 0; - j++; - if (j >= chunk) { + if (++j >= chunk) { chunk += 50; pgart.rawl = my_realloc(pgart.rawl, sizeof(t_lineinfo) * chunk); } diff -Nurp tin-1.6.1/src/post.c tin-1.7.0/src/post.c --- tin-1.6.1/src/post.c Sun Jul 27 14:21:59 2003 +++ tin-1.7.0/src/post.c Sun Aug 10 15:32:09 2003 @@ -3,7 +3,7 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-06-18 + * Updated : 2003-08-10 * Notes : mail/post/replyto/followup/repost & cancel articles * * Copyright (c) 1991-2003 Iain Lea @@ -2898,7 +2898,8 @@ int mail_to_someone( const char *address, t_bool confirm_to_mail, - t_openartinfo *artinfo) + t_openartinfo *artinfo, + const struct t_group *group) { FILE *fp; char ch = iKeyPostSend; @@ -2943,7 +2944,7 @@ mail_to_someone( } else { if (confirm_to_mail) ch = prompt_to_send(subject); - ret_code = mail_loop(nam, ch, subject, NULL, NULL); + ret_code = mail_loop(nam, ch, subject, group ? group->name : NULL, NULL); } if (tinrc.unlink_article)