From 4a0b020a3048f079979bea43c04f9fe388f9354d Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Thu, 9 Nov 2006 11:33:07 +0100 Subject: [PATCH] move menu.[hc]. fix a compilation problem with gnutls. Signed-off-by: Pierre Habouzit --- Makefile.am | 8 +++----- alias.c | 2 +- attach.c | 2 +- browser.c | 2 +- commands.c | 2 +- compose.c | 2 +- flags.c | 2 +- keymap.c | 2 +- lib-crypt/crypt-gpgme.c | 2 +- lib-crypt/pgp.c | 2 +- lib-crypt/pgpkey.c | 2 +- lib-crypt/smime.c | 2 +- lib-ui/Makefile.am | 7 ++++--- lib-ui/color.c | 2 +- lib-ui/curs_lib.c | 6 +++--- lib-ui/curs_main.c | 6 +++--- lib-ui/enter.c | 6 +++--- menu.c => lib-ui/menu.c | 6 +++--- mutt_menu.h => lib-ui/menu.h | 0 mutt_ssl.c | 2 +- mutt_ssl_gnutls.c | 23 ++++++++--------------- pager.c | 2 +- postpone.c | 2 +- query.c | 3 ++- recvattach.c | 2 +- recvattach.h | 3 ++- recvcmd.c | 2 +- remailer.c | 2 +- sidebar.c | 2 +- status.c | 2 +- 30 files changed, 51 insertions(+), 57 deletions(-) rename menu.c => lib-ui/menu.c (99%) rename mutt_menu.h => lib-ui/menu.h (100%) diff --git a/Makefile.am b/Makefile.am index 565cb8a..d3bc3dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ madmutt_SOURCES = $(BUILT_SOURCES) \ flags.c filter.c from.c getdomain.c \ handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \ init.c keymap.c lib.c \ - main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \ + main.c mbox.c mbyte.c mh.c muttlib.c mutt_idna.c mx.c \ pager.c pattern.c postpone.c query.c \ recvattach.c recvcmd.c rfc1524.c rfc3676.c \ score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \ @@ -69,14 +69,12 @@ EXTRA_madmutt_SOURCES = \ mutt_idna.h mutt_libesmtp.c sidebar.h state.h EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ - configure acconfig.h \ - account.h alias.h attach.h recvattach.h handler.h thread.h \ + configure account.h alias.h attach.h recvattach.h handler.h thread.h \ buffy.h charset.h compress.h copy.h \ dotlock.h functions.def gen_defs \ recvattach.h handler.h thread.h \ globals.h history.h init.h keymap.h mutt_crypt.h \ - mime.h mutt.h mutt_menu.h \ - mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \ + mime.h mutt.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \ mbox.h mh.h mx.h pager.h protos.h rfc1524.h \ rfc3676.h sort.h mime.types autogen.sh \ _regex.h OPS.MIX remailer.c remailer.h browser.h state.h \ diff --git a/alias.c b/alias.c index 028f9ba..e8f109b 100644 --- a/alias.c +++ b/alias.c @@ -23,13 +23,13 @@ #include #include +#include #include "lib/rx.h" #include "lib/debug.h" #include "mutt.h" #include "mutt_idna.h" -#include "mutt_menu.h" #include "sort.h" #define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x diff --git a/attach.c b/attach.c index 720e17a..3fbe7d2 100644 --- a/attach.c +++ b/attach.c @@ -21,11 +21,11 @@ #include #include +#include #include "mutt.h" #include "handler.h" #include "recvattach.h" -#include "mutt_menu.h" #include "keymap.h" #include "rfc1524.h" #include "pager.h" diff --git a/browser.c b/browser.c index 8bebbac..5544e5a 100644 --- a/browser.c +++ b/browser.c @@ -19,10 +19,10 @@ #include #include +#include #include "mutt.h" #include "mx.h" -#include "mutt_menu.h" #include "buffy.h" #include "sort.h" #include "browser.h" diff --git a/commands.c b/commands.c index cc78d45..b1ae870 100644 --- a/commands.c +++ b/commands.c @@ -21,10 +21,10 @@ #include #include +#include #include "mutt.h" #include "recvattach.h" -#include "mutt_menu.h" #include "sort.h" #include "copy.h" #include "mx.h" diff --git a/compose.c b/compose.c index d352b84..78a55a6 100644 --- a/compose.c +++ b/compose.c @@ -25,10 +25,10 @@ #include #include +#include #include "mutt.h" #include "mutt_idna.h" -#include "mutt_menu.h" #include "rfc1524.h" #include "attach.h" #include "recvattach.h" diff --git a/flags.c b/flags.c index dc6bafa..cbfb231 100644 --- a/flags.c +++ b/flags.c @@ -14,9 +14,9 @@ #include #include +#include #include "mutt.h" -#include "mutt_menu.h" #include "sort.h" #include "mx.h" #include "sidebar.h" diff --git a/keymap.c b/keymap.c index c7cede6..716308a 100644 --- a/keymap.c +++ b/keymap.c @@ -19,9 +19,9 @@ #include #include +#include #include "mutt.h" -#include "mutt_menu.h" #include "keymap.h" #include diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c index 809cec0..f20d052 100644 --- a/lib-crypt/crypt-gpgme.c +++ b/lib-crypt/crypt-gpgme.c @@ -28,10 +28,10 @@ #include #include +#include #include "mutt.h" #include -#include "mutt_menu.h" #include "handler.h" #include "copy.h" #include "pager.h" diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c index 038ba81..b69bc9b 100644 --- a/lib-crypt/pgp.c +++ b/lib-crypt/pgp.c @@ -31,6 +31,7 @@ #include #include +#include #include "mutt.h" #include "handler.h" @@ -61,7 +62,6 @@ #endif #include "crypt.h" -#include "mutt_menu.h" char PgpPass[LONG_STRING]; diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c index c397394..b8ceda5 100644 --- a/lib-crypt/pgpkey.c +++ b/lib-crypt/pgpkey.c @@ -22,10 +22,10 @@ #include #include +#include #include "mutt.h" #include "recvattach.h" -#include "mutt_menu.h" #include "pgp.h" #include "pager.h" #include "sort.h" diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c index fe6b6cf..78d360d 100644 --- a/lib-crypt/smime.c +++ b/lib-crypt/smime.c @@ -22,10 +22,10 @@ #include #include +#include #include "mutt.h" #include "handler.h" -#include "mutt_menu.h" #include "copy.h" #include "lib/debug.h" diff --git a/lib-ui/Makefile.am b/lib-ui/Makefile.am index 56039cd..be41b0b 100644 --- a/lib-ui/Makefile.am +++ b/lib-ui/Makefile.am @@ -1,9 +1,10 @@ noinst_LIBRARIES = libui.a libui_a_SOURCES = curses.h \ - enter.h \ - enter.c color.c curs_lib.c curs_main.c + enter.h menu.h \ + enter.c menu.c color.c curs_lib.c curs_main.c -noinst_HEADERS = curses.h +noinst_HEADERS = curses.h \ + enter.h menu.h -include ../cflags.mk diff --git a/lib-ui/color.c b/lib-ui/color.c index c573520..20fb8b0 100644 --- a/lib-ui/color.c +++ b/lib-ui/color.c @@ -18,7 +18,7 @@ #include #include -#include +#include "curses.h" #include "mutt.h" diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c index e618301..20fd3da 100644 --- a/lib-ui/curs_lib.c +++ b/lib-ui/curs_lib.c @@ -20,11 +20,11 @@ #include #include -#include -#include +#include "curses.h" +#include "menu.h" +#include "enter.h" #include "mutt.h" -#include "mutt_menu.h" #include "pager.h" #include "mbyte.h" diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c index 94b1d6f..1d2be6d 100644 --- a/lib-ui/curs_main.c +++ b/lib-ui/curs_main.c @@ -19,13 +19,13 @@ #include #include -#include - #include +#include "curses.h" +#include "menu.h" + #include "mutt.h" #include "mx.h" -#include "mutt_menu.h" #include "sort.h" #include "recvattach.h" #include "buffy.h" diff --git a/lib-ui/enter.c b/lib-ui/enter.c index 0e13325..3eb1f13 100644 --- a/lib-ui/enter.c +++ b/lib-ui/enter.c @@ -14,11 +14,11 @@ #include -#include -#include +#include "curses.h" +#include "enter.h" +#include "menu.h" #include "mutt.h" -#include "mutt_menu.h" #include "keymap.h" #include "history.h" #include "buffy.h" diff --git a/menu.c b/lib-ui/menu.c similarity index 99% rename from menu.c rename to lib-ui/menu.c index 4c58f1b..a8f9925 100644 --- a/menu.c +++ b/lib-ui/menu.c @@ -15,11 +15,11 @@ #include #include -#include -#include +#include "curses.h" +#include "enter.h" +#include "menu.h" #include "mutt.h" -#include "mutt_menu.h" #include "mbyte.h" #include "sidebar.h" diff --git a/mutt_menu.h b/lib-ui/menu.h similarity index 100% rename from mutt_menu.h rename to lib-ui/menu.h diff --git a/mutt_ssl.c b/mutt_ssl.c index aadbf7a..315ba52 100644 --- a/mutt_ssl.c +++ b/mutt_ssl.c @@ -25,10 +25,10 @@ #include #include +#include #include "mutt.h" #include "mutt_socket.h" -#include "mutt_menu.h" #include "mutt_ssl.h" #include "lib/debug.h" diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c index 147ddca..9382054 100644 --- a/mutt_ssl_gnutls.c +++ b/mutt_ssl_gnutls.c @@ -26,10 +26,10 @@ #include #include +#include #include "mutt.h" #include "mutt_socket.h" -#include "mutt_menu.h" #include "mutt_ssl.h" #include "lib/rx.h" @@ -188,7 +188,7 @@ static int tls_negotiate (CONNECTION * conn) gnutls_init (&data->state, GNUTLS_CLIENT); /* set socket */ - gnutls_transport_set_ptr (data->state, (gnutls_transport_ptr) conn->fd); + gnutls_transport_set_ptr (data->state, (gnutls_transport_ptr)(intptr_t)conn->fd); /* disable TLS/SSL protocols as needed */ if (!option (OPTTLSV1) && !option (OPTSSLV3)) { @@ -457,7 +457,7 @@ static int tls_check_certificate (CONNECTION * conn) time_t t; const gnutls_datum *cert_list; unsigned int cert_list_size = 0; - gnutls_certificate_status certstat; + gnutls_certificate_status_t certstat; char datestr[30]; gnutls_x509_crt cert; gnutls_datum pemdata; @@ -474,18 +474,11 @@ static int tls_check_certificate (CONNECTION * conn) return 0; } - certstat = gnutls_certificate_verify_peers (state); - - if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND) { - mutt_error (_("Unable to get certificate from peer")); - mutt_sleep (2); - return 0; - } - if (certstat < 0) { - mutt_error (_("Certificate verification error (%s)"), - gnutls_strerror (certstat)); - mutt_sleep (2); - return 0; + if (gnutls_certificate_verify_peers2(state, &certstat) < 0) { + mutt_error (_("Certificate verification error (%s)"), + gnutls_strerror(certstat)); + mutt_sleep (2); + return 0; } /* We only support X.509 certificates (not OpenPGP) at the moment */ diff --git a/pager.c b/pager.c index 05c7688..044d2dc 100644 --- a/pager.c +++ b/pager.c @@ -22,10 +22,10 @@ #include #include +#include #include "mutt.h" #include "keymap.h" -#include "mutt_menu.h" #include "sort.h" #include "pager.h" #include "attach.h" diff --git a/postpone.c b/postpone.c index 1f5f000..311ea28 100644 --- a/postpone.c +++ b/postpone.c @@ -22,10 +22,10 @@ #include #include +#include #include "mutt.h" #include "handler.h" -#include "mutt_menu.h" #include "rfc1524.h" #include "sort.h" #include "thread.h" diff --git a/query.c b/query.c index bcb3c13..5509aac 100644 --- a/query.c +++ b/query.c @@ -17,8 +17,9 @@ #include #include +#include + #include "mutt.h" -#include "mutt_menu.h" #include "mutt_idna.h" #include "sort.h" diff --git a/recvattach.c b/recvattach.c index 2a03049..67326fb 100644 --- a/recvattach.c +++ b/recvattach.c @@ -23,11 +23,11 @@ #include #include +#include #include "mutt.h" #include "handler.h" #include "recvattach.h" -#include "mutt_menu.h" #include "rfc1524.h" #include "attach.h" #include "mx.h" diff --git a/recvattach.h b/recvattach.h index ab83c9b..919b464 100644 --- a/recvattach.h +++ b/recvattach.h @@ -11,8 +11,9 @@ #include +#include + #include "mutt.h" -#include "mutt_menu.h" #include "attach.h" void mutt_update_tree (ATTACHPTR **, short); diff --git a/recvcmd.c b/recvcmd.c index 39af5fa..f504547 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -21,12 +21,12 @@ #include #include +#include #include "mutt.h" #include "state.h" #include "handler.h" #include "recvattach.h" -#include "mutt_menu.h" #include "rfc1524.h" #include "attach.h" #include "mx.h" diff --git a/remailer.c b/remailer.c index 94cd444..d60048b 100644 --- a/remailer.c +++ b/remailer.c @@ -23,10 +23,10 @@ #include #include +#include #include "mutt.h" #include "recvattach.h" -#include "mutt_menu.h" #include "remailer.h" diff --git a/sidebar.c b/sidebar.c index 0d63aaa..faf9bcf 100644 --- a/sidebar.c +++ b/sidebar.c @@ -17,9 +17,9 @@ #include #include +#include #include "mutt.h" -#include "mutt_menu.h" #include "sidebar.h" #include "buffy.h" #include "keymap.h" diff --git a/status.c b/status.c index 18c9684..80eac1d 100644 --- a/status.c +++ b/status.c @@ -17,9 +17,9 @@ #include #include +#include #include "mutt.h" -#include "mutt_menu.h" #include "sort.h" #include "mx.h" #include "buffy.h" -- 2.20.1