Imported Upstream version 0.5.6

diff --git a/BUGS b/BUGS
index 8899c06e87c8ee97072ccf2b4235bd77b3255940..b1164c62e4d1753f8a333b824e799fbf525de006 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -17,6 +17,20 @@ known bugs in abook
 
 * file format is not tolerant for character set changes
 
+--
+[25]
+name=Lastname, Firstname
+email="Lastname, Firstname" <firstname.lastname@example.com>
+
+but the command "abook --mutt-query lastname" returns two email addresses
+
+"Lastname       Lastname, Firstname
+Firstname" <firstname.lastname@example.com>     Lastname, Firstname
+
+In other words, the mutt-query doesn't treat the comma as protected by the
+quotes, although the conversion from pine format did.
+--
+
 Filters:
 * mutt / elm / pine export filters allow to create a file with duplicate
   aliases
@@ -25,4 +39,4 @@ Filters:
 
 * fseek in ldif import filter should be eliminated
 
-$Id: BUGS,v 1.16 2005/08/29 10:02:50 jheinonen Exp $
+$Id: BUGS,v 1.16.2.1 2006/02/23 13:39:13 jheinonen Exp $

diff --git a/ChangeLog b/ChangeLog
index 22771a6bb83b1cd540e6e74ad39695ec5a1e0878..2f96df3f663f539009dece79c27894f06f6f5d8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.5.6
+ - translation fixes
+ - fixed gcrd export format (\r\n line endings according to RFC, Marc Tardif)
+ - fix localized keybindings with --disable-nls
+
 0.5.5
  - i18n support (Cedric Duval)
  - French translation (Cedric Duval)

diff --git a/abook.spec b/abook.spec
index e12060bdfdf28954d74a3ea329e020d8d1068941..48ce4b487d842793815512df9b29a8a534f59033 100644 (file)
--- a/abook.spec
+++ b/abook.spec
@@ -1,6 +1,6 @@
 Summary:       Text-based addressbook program
 Name:          abook
-Version:       0.5.5
+Version:       0.5.6
 Release:       1
 License:       GPL
 Group:         Utilities

diff --git a/config.guess b/config.guess
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/config.sub b/config.sub
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/configure b/configure
index cd6b85ab6c4f3ce473a01c0d36601ab2d3fb1a90..0dc41240654dbd13e04a39896b0f6bf0c3f300ba 100755 (executable)
--- a/configure
+++ b/configure
@@ -1622,7 +1622,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=abook
- VERSION=0.5.5
+ VERSION=0.5.6
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.in b/configure.in
index f5f18b983a62085209593d60f1e41b2b60229807..e6cc9222da95b92454c7341988e3651a477715e4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.5)
+AM_INIT_AUTOMAKE(abook, 0.5.6)
 AM_CONFIG_HEADER(config.h)
 
 dnl ---------------

diff --git a/filter.c b/filter.c
index 67494902c65b3984102f570c2cf64522e8706275..8d0faa95a01b3a9f6cae2850a4a5392d57c4d1bf 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: filter.c,v 1.48.2.1 2005/10/26 19:45:23 jheinonen Exp $
+ * $Id: filter.c,v 1.48.2.1.2.2 2006/04/10 16:02:10 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -908,7 +908,7 @@ pine_fixbuf(char *buf)
 {
        int i,j;
 
-       for(i=0,j=0; j < (int)strlen(buf); i++, j++)
+       for(i = 0,j = 0; j < (int)strlen(buf); i++, j++)
                buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
 }
 
@@ -921,18 +921,17 @@ pine_convert_emails(char *s)
        if(s == NULL || *s != '(')
                return;
 
-       for(i=0; s[i]; i++ )
-               s[i] = s[i+1];
+       for(i = 0; s[i]; i++)
+               s[i] = s[i + 1];
 
        if( ( tmp = strchr(s,')')) )
-               *tmp=0;
+               *tmp = '\0';
 
        for(i = 1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1)
                if(i > MAX_EMAILS - 1) {
-                       *tmp = 0;
+                       *tmp = '\0';
                        break;
                }
-
 }
 
 static void
@@ -943,11 +942,11 @@ pine_parse_buf(char *buf)
        char *end;
        char tmp[PINE_BUF_SIZE];
        int i, len, last;
-       int pine_conv_table[]= {NICK, NAME, EMAIL, -1, NOTES};
+       int pine_conv_table[] = {NICK, NAME, EMAIL, -1, NOTES};
 
        memset(&item, 0, sizeof(item));
 
-       for(i=0, last=0; !last ; i++) {
+       for(i = 0, last=0; !last ; i++) {
                if( !(end = strchr(start, '\t')) )
                        last=1;
 
@@ -1510,7 +1509,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
        char *name;
 
        db_enumerate_items(e) {
-               fprintf(out, "BEGIN:VCARD\nFN:%s\n",
+               fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
                                safe_str(database[e.item][NAME]));
 
                name = get_surname(database[e.item][NAME]);
@@ -1518,7 +1517,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
                        if(database[e.item][NAME][j] == ' ')
                                break;
                }
-               fprintf(out, "N:%s;%.*s\n",
+               fprintf(out, "N:%s;%.*s\r\n",
                        safe_str(name),
                        j,
                        safe_str(database[e.item][NAME])
@@ -1527,7 +1526,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
                free(name);
 
                if ( database[e.item][ADDRESS] )
-                       fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\n",
+                       fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
                                safe_str(database[e.item][ADDRESS]),
                                safe_str(database[e.item][ADDRESS2]),
                                safe_str(database[e.item][CITY]),
@@ -1537,29 +1536,32 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
                                );
 
                if (database[e.item][PHONE])
-                       fprintf(out, "TEL;HOME:%s\n", database[e.item][PHONE]);
+                       fprintf(out, "TEL;HOME:%s\r\n",
+                               database[e.item][PHONE]);
                if (database[e.item][WORKPHONE])
-                       fprintf(out, "TEL;WORK:%s\n", database[e.item][WORKPHONE]);
+                       fprintf(out, "TEL;WORK:%s\r\n",
+                               database[e.item][WORKPHONE]);
+
                if (database[e.item][FAX])
-                       fprintf(out, "TEL;FAX:%s\n", database[e.item][FAX]);
+                       fprintf(out, "TEL;FAX:%s\r\n", database[e.item][FAX]);
                if (database[e.item][MOBILEPHONE])
-                       fprintf(out, "TEL;CELL:%s\n", database[e.item][MOBILEPHONE]);
+                       fprintf(out, "TEL;CELL:%s\r\n", database[e.item][MOBILEPHONE]);
 
                if ( database[e.item][EMAIL] ) {
                        split_emailstr(e.item, emails);
                        for(j=0; j < MAX_EMAILS ; j++) {
                                if ( *emails[j] )
-                                       fprintf(out, "EMAIL;INTERNET:%s\n",
+                                       fprintf(out, "EMAIL;INTERNET:%s\r\n",
                                                emails[j]);
                        }
                }
 
                if ( database[e.item][NOTES] )
-                       fprintf(out, "NOTE:%s\n", database[e.item][NOTES]);
+                       fprintf(out, "NOTE:%s\r\n", database[e.item][NOTES]);
                if (database[e.item][URL])
-                       fprintf(out, "URL:%s\n",  database[e.item][URL]);
+                       fprintf(out, "URL:%s\r\n",  database[e.item][URL]);
 
-               fprintf(out, "END:VCARD\n\n");
+               fprintf(out, "END:VCARD\r\n\r\n");
 
        }
 

diff --git a/gettext.c b/gettext.c
index 949e843b4caa7e6f7e17ea944ca2fad7e8605251..0dd9dbf7f9fc46b4ddcd22c9e912e8956691e595 100644 (file)
--- a/gettext.c
+++ b/gettext.c
@@ -2,18 +2,17 @@
 #      include "config.h"
 #endif
 
-#ifdef ENABLE_NLS
 #include <string.h>
 #include "gettext.h"
 
-char *
+const char *
 sgettext(const char *msgid)
 {
-       char *msgval = gettext(msgid);
+       const char *msgval = gettext(msgid);
 
        if(msgval == msgid)
                msgval = strrchr(msgid, '|') + 1;
 
        return msgval;
 }
-#endif
+

diff --git a/gettext.h b/gettext.h
index 332a7f6beb5855199ff7e55ed3deac5a33678261..6e2973c8016d49d756466806f8a3f65d5aff233b 100644 (file)
--- a/gettext.h
+++ b/gettext.h
@@ -1,15 +1,14 @@
 #ifndef _GETTEXT_H
 #define _GETTEXT_H
 
+const char *sgettext(const char *msgid); /* Strip context prefix */
+
 # if ENABLE_NLS
 #  include <libintl.h>
-char *sgettext(const char *msgid); /* Strip context prefix */
 # else
 #  define gettext(Msgid) ((const char *) (Msgid))
-#  define sgettext(Msgid) ((const char *) (Msgid))
-
-#  define textdomain(Domainname) ((const char *) (Domainname))
-#  define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+#  define textdomain(Domainname) do {} while(0)
+#  define bindtextdomain(Domainname, Dirname) do {} while(0)
 # endif /* ENABLE_NLS */
 
 # define _(String) gettext (String)

diff --git a/help.h b/help.h
index 7de967ee1c115e59a0b8c192cc9db490507d14c5..776a0003cc13469dac1c070a53ba7375b3dd40db 100644 (file)
--- a/help.h
+++ b/help.h
@@ -44,7 +44,7 @@ N_("  A               move current item up\n"),
 N_("   Z               move current item down\n"),
 "\n",
 N_("   m               send mail with mutt\n"),
-N_("   u               view URL with web browser\n"),
+N_("   v               view URL with web browser\n"),
 NULL
 
 };

diff --git a/options.c b/options.c
index 235da40b1bbde08e80ac8cb3b1cc8d5973d48559..3b8c338b059c316796ebb2a7a3a38e9b371ed89a 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: options.c,v 1.27 2005/09/21 16:50:31 jheinonen Exp $
+ * $Id: options.c,v 1.27.4.1 2006/04/09 18:57:34 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -226,7 +226,7 @@ find_token_end(buffer *b)
        }
 }
 
-static char *
+static const char *
 opt_set_set_option(char *var, char *p, struct option *opt)
 {
        int len;
@@ -265,7 +265,7 @@ opt_set_set_option(char *var, char *p, struct option *opt)
        return NULL;
 }
 
-static char *
+static const char *
 opt_parse_set(buffer *b)
 {
        int i;
@@ -288,7 +288,7 @@ opt_parse_set(buffer *b)
 
 #include "database.h" /* needed for change_custom_field_name */
 
-static char *
+static const char *
 opt_parse_customfield(buffer *b)
 {
        char *p, num[5];
@@ -315,7 +315,7 @@ opt_parse_customfield(buffer *b)
 
 static struct {
        char *token;
-       char * (*func) (buffer *line);
+       const char * (*func) (buffer *line);
 } opt_parsers[] = {
        { "set", opt_parse_set },
        { "customfield", opt_parse_customfield },
@@ -326,7 +326,7 @@ static bool
 opt_parse_line(char *line, int n, char *fn)
 {
        int i;
-       char *err = NULL;
+       const char *err = NULL;
        char *token;
        buffer b;
 

diff --git a/po/abook.pot b/po/abook.pot
index 72d5bb731889e3f459b28f8d1ea28ba05a192309..f68b46e631b186dc6c3876f3039b9602f22ad6d0 100644 (file)
--- a/po/abook.pot
+++ b/po/abook.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-27 17:07+0300\n"
+"POT-Creation-Date: 2005-12-06 07:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -574,7 +574,7 @@ msgid "\tm\t\tsend mail with mutt\n"
 msgstr ""
 
 #: help.h:47
-msgid "\tu\t\tview URL with web browser\n"
+msgid "\tv\t\tview URL with web browser\n"
 msgstr ""
 
 #: help.h:55

diff --git a/po/de.gmo b/po/de.gmo
index bfc0405c8e6222179cfef54af2be417aafd2b120..3fe1872864821a4865a48f1a3a1deea76138f6a6 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/de.po b/po/de.po
index 64d9c0efa72b5ba7795dc3e981a0b54da11eae8d..13647d44376049e55ff70b78e16bb77ed9cf08a5 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: abook 0.5.5pre1\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-27 17:07+0300\n"
+"POT-Creation-Date: 2005-12-06 07:50+0200\n"
 "PO-Revision-Date: 2005-10-03 00:56+0200\n"
 "Last-Translator: Johannes Weißl <jargon@molb.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -599,8 +599,8 @@ msgid "\tm\t\tsend mail with mutt\n"
 msgstr "\tm\t\tE-Mail mit Mutt senden\n"
 
 #: help.h:47
-msgid "\tu\t\tview URL with web browser\n"
-msgstr "\tu\t\tURL mit Web-Browser anzeigen\n"
+msgid "\tv\t\tview URL with web browser\n"
+msgstr "\tv\t\tURL mit Web-Browser anzeigen\n"
 
 #: help.h:55
 msgid "\ta,c,p,o,C/arrows/h,l\tchange tab\n"

diff --git a/po/fr.gmo b/po/fr.gmo
index f4fd9cf7fa83b303821d57ab7195f40f2530a94d..a9790e99117db22dfcad74a0d85e17767bbbaec7 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index d29a723e0df5440f9e8ff5f914c8c0d4a0a1e234..1a469d37dca5ae5f11105814e777e5947efa961c 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: abook\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-27 17:07+0300\n"
+"POT-Creation-Date: 2005-12-06 07:50+0200\n"
 "PO-Revision-Date: 2005-10-03 10:53+0200\n"
 "Last-Translator: Cedric Duval <cedricduval+abook@free.fr>\n"
 "Language-Team: french\n"
@@ -563,7 +563,7 @@ msgstr "\ts\t\tclasser la base de données\n"
 
 #: help.h:37
 msgid "\tS\t\t\"surname sort\"\n"
-msgstr "\ts\t\tclassement par nom de famille\n"
+msgstr "\tS\t\tclassement par nom de famille\n"
 
 #: help.h:38
 msgid "\tF\t\tsort by field (defined in configuration file)\n"
@@ -592,8 +592,8 @@ msgid "\tm\t\tsend mail with mutt\n"
 msgstr "\tm\t\tenvoyer un courrier électronique avec mutt\n"
 
 #: help.h:47
-msgid "\tu\t\tview URL with web browser\n"
-msgstr "\tu\t\tvisualiser l'URL avec un navigateur web\n"
+msgid "\tv\t\tview URL with web browser\n"
+msgstr "\tv\t\tvisualiser l'URL avec un navigateur web\n"
 
 #: help.h:55
 msgid "\ta,c,p,o,C/arrows/h,l\tchange tab\n"

diff --git a/po/ja.gmo b/po/ja.gmo
index c365b4267b0dffd78e7b3ce12530fc72b6c2bb1c..3acef2815f70cd2f8c443613c3ef5edd1133f04c 100644 (file)
Binary files a/po/ja.gmo and b/po/ja.gmo differ

diff --git a/po/ja.po b/po/ja.po
index 8fbc545f9672bcca9bdc4825296750591f0919e6..8eb5e5bfa9d90cb3c7e40f6c1160c3712061349e 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.5\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-27 17:07+0300\n"
+"POT-Creation-Date: 2005-12-06 07:50+0200\n"
 "PO-Revision-Date: 2005-10-18 18:10+0200\n"
 "Last-Translator: TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp>\n"
 "Language-Team: japanese\n"
@@ -583,8 +583,8 @@ msgid "\tm\t\tsend mail with mutt\n"
 msgstr "\tm\t\tMutt ¤Ç¥á¡¼¥ë¤òÁ÷¤ë\n"
 
 #: help.h:47
-msgid "\tu\t\tview URL with web browser\n"
-msgstr "\tu\t\tURL ¤ò¥Ö¥é¥¦¥¶¤Ç±ÜÍ÷¤¹¤ë\n"
+msgid "\tv\t\tview URL with web browser\n"
+msgstr "\tv\t\tURL ¤ò¥Ö¥é¥¦¥¶¤Ç±ÜÍ÷¤¹¤ë\n"
 
 #: help.h:55
 msgid "\ta,c,p,o,C/arrows/h,l\tchange tab\n"

diff --git a/po/sv.gmo b/po/sv.gmo
index 3aa41eea0c8bb9daac8e61934bfee820e7c2cd8b..72cc1247ef2747a918f16c31bb2d5d9054f41b1e 100644 (file)
Binary files a/po/sv.gmo and b/po/sv.gmo differ

diff --git a/po/sv.po b/po/sv.po
index d8862d638d84b5197e9b6542a42d03c738c77344..03572f6da5f6c55def2a435deea157e504583794 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: abook 0.5.4\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-27 17:07+0300\n"
+"POT-Creation-Date: 2005-12-06 07:50+0200\n"
 "PO-Revision-Date: 2005-09-23 22:13+0200\n"
 "Last-Translator: Susanna Björverud <susanna.bjorverud@telia.com>\n"
 "Language-Team: none\n"
@@ -588,8 +588,8 @@ msgid "\tm\t\tsend mail with mutt\n"
 msgstr "\tm\t\tskicka post med mutt\n"
 
 #: help.h:47
-msgid "\tu\t\tview URL with web browser\n"
-msgstr "\tu\t\tvisa URL i webbläsare\n"
+msgid "\tv\t\tview URL with web browser\n"
+msgstr "\tv\t\tvisa URL i webbläsare\n"
 
 #: help.h:55
 msgid "\ta,c,p,o,C/arrows/h,l\tchange tab\n"

diff --git a/ui.c b/ui.c
index 0fc8273d3ab8bb754bf8e9ee0768d1405323565f..d42f26e9eb78597e91b536573c7c731db2d16431 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ui.c,v 1.54 2005/10/05 11:03:36 jheinonen Exp $
+ * $Id: ui.c,v 1.54.4.1 2006/04/09 18:57:34 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -306,7 +306,7 @@ statusline_askchoice(const char *msg, const char *choices, short dflt)
 }
 
 char *
-ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
+ui_readline(const char *prompt, char *s, size_t limit, bool use_completion)
 {
        int y, x;
        char *ret;
@@ -327,7 +327,7 @@ ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
 }
 
 int
-statusline_ask_boolean(char *msg, int def)
+statusline_ask_boolean(const char *msg, int def)
 {
        int ret;
        char *msg2 = strconcat(msg,  def ? _(" (Y/n)?") : _(" (y/N)?"), NULL);
@@ -363,7 +363,7 @@ refresh_statusline()
 }
 
 char *
-ask_filename(char *prompt)
+ask_filename(const char *prompt)
 {
        char *buf = NULL;
 

diff --git a/ui.h b/ui.h
index 7e1b8a8cda6008d8882236bc2d2ad0e447f346a6..e811431e0701acdf6b7b13b261fd0cd1f1352966 100644 (file)
--- a/ui.h
+++ b/ui.h
@@ -15,13 +15,15 @@ void                close_ui();
 void           headerline(const char *str);
 void            refresh_screen();
 int            statusline_msg(const char *msg);
-int            statusline_askchoice(const char *msg, const char *choices, short dflt);
-char           *ask_filename(char *prompt);
-int            statusline_ask_boolean(char *msg, int def);
+int            statusline_askchoice(const char *msg, const char *choices,
+                       short dflt);
+char           *ask_filename(const char *prompt);
+int            statusline_ask_boolean(const char *msg, int def);
 void            clear_statusline();
 void           display_help(int help);
 void           statusline_addstr(const char *str);
-char *         ui_readline(char *prompt, char *s, size_t limit, bool use_completion);
+char *         ui_readline(const char *prompt, char *s, size_t limit,
+                       bool use_completion);
 void           refresh_statusline();
 void           get_commands();
 void           ui_remove_items();