diff options
Diffstat (limited to 'gpglib')
| -rw-r--r-- | gpglib/Makefile.am | 6 | ||||
| -rw-r--r-- | gpglib/checksign.c | 2 | ||||
| -rw-r--r-- | gpglib/delete.c | 3 | ||||
| -rw-r--r-- | gpglib/export.c | 2 | ||||
| -rw-r--r-- | gpglib/genkey.c | 9 | ||||
| -rw-r--r-- | gpglib/import.c | 2 | ||||
| -rw-r--r-- | gpglib/list.c | 7 | ||||
| -rw-r--r-- | gpglib/sign.c | 2 | ||||
| -rw-r--r-- | gpglib/testgpg.c | 2 |
9 files changed, 16 insertions, 19 deletions
diff --git a/gpglib/Makefile.am b/gpglib/Makefile.am index 3ea6fbd..ea048d4 100644 --- a/gpglib/Makefile.am +++ b/gpglib/Makefile.am @@ -17,17 +17,17 @@ libgpg_la_SOURCES=checksign.c delete.c export.c fork.c genkey.c gpg.c gpglib.h\ sign.c tempname.c tempname.h testgpg_SOURCES=testgpg.c -testgpg_LDADD=libgpg.la ../unicode/libunicode.la ../numlib/libnumlib.la +testgpg_LDADD=libgpg.la ../numlib/libnumlib.la -lunicode testgpg_DEPENDENCIES=$(testgpg_LDADD) testgpg_LDFLAGS=-static mimegpg_SOURCES=mimegpg.c mimegpg_LDADD=libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \ ../rfc822/libencode.la ../numlib/libnumlib.la \ - ../unicode/libunicode.la + -lunicode mimegpg_DEPENDENCIES=libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la\ ../rfc822/libencode.la ../numlib/libnumlib.la \ - ../unicode/libunicode.la + -lunicode BUILT_SOURCES=gpg.h mimegpg.html mimegpg.1 EXTRA_DIST=mimegpg.html mimegpg.1 README.html diff --git a/gpglib/checksign.c b/gpglib/checksign.c index a5333ba..62143cd 100644 --- a/gpglib/checksign.c +++ b/gpglib/checksign.c @@ -12,11 +12,11 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/delete.c b/gpglib/delete.c index 53943c9..1ecf66b 100644 --- a/gpglib/delete.c +++ b/gpglib/delete.c @@ -12,11 +12,10 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> - +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/export.c b/gpglib/export.c index 66a4a05..c8cf5d7 100644 --- a/gpglib/export.c +++ b/gpglib/export.c @@ -14,11 +14,11 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/genkey.c b/gpglib/genkey.c index 9e72f1c..1703e3c 100644 --- a/gpglib/genkey.c +++ b/gpglib/genkey.c @@ -14,11 +14,10 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> - +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; @@ -57,19 +56,19 @@ int libmail_gpg_genkey(const char *gpgdir, char *argvec[4]; int rc; - name_u=libmail_u_convert_toutf8(name, charset, NULL); + name_u=unicode_convert_toutf8(name, charset, NULL); if (!name_u) return (-1); - addr_u=libmail_u_convert_toutf8(addr, charset, NULL); + addr_u=unicode_convert_toutf8(addr, charset, NULL); if (!addr_u) { free(name_u); return (-1); } - comment_u=libmail_u_convert_toutf8(comment, charset, NULL); + comment_u=unicode_convert_toutf8(comment, charset, NULL); if (!comment_u) return (-1); diff --git a/gpglib/import.c b/gpglib/import.c index b3cdd38..32de753 100644 --- a/gpglib/import.c +++ b/gpglib/import.c @@ -12,11 +12,11 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/list.c b/gpglib/list.c index 7b58355..146c05b 100644 --- a/gpglib/list.c +++ b/gpglib/list.c @@ -16,11 +16,10 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> - +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; @@ -389,7 +388,7 @@ static int dolist_callback(char *line, void *vp1, return (-1); } - userid=libmail_u_convert_fromutf8(userid, vp->charset, NULL); + userid=unicode_convert_fromutf8(userid, vp->charset, NULL); if (!userid) return (-1); @@ -541,7 +540,7 @@ int libmail_gpg_listgroups(const char *gpgdir, if (*p == 0) continue; - q=libmail_u_convert_fromutf8(p, voidarg->charset, NULL); + q=unicode_convert_fromutf8(p, voidarg->charset, NULL); if (!q) continue; diff --git a/gpglib/sign.c b/gpglib/sign.c index a92a504..9bbfec4 100644 --- a/gpglib/sign.c +++ b/gpglib/sign.c @@ -9,6 +9,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <unicode.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> @@ -18,7 +19,6 @@ #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/testgpg.c b/gpglib/testgpg.c index a08620b..942abd4 100644 --- a/gpglib/testgpg.c +++ b/gpglib/testgpg.c @@ -8,7 +8,7 @@ #include "config.h" #include "gpglib.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "numlib/numlib.h" #include <stdio.h> |