X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-sys%2Fmutt_socket.c;h=72473bc52aa75933eec67b209333fc40c527d005;hb=85fd0dfe747c58f2da62074ddd90a598397a4848;hp=78a609fabadf2bfdc63da855cb70f25c05b3119d;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;p=apps%2Fmadmutt.git

diff --git a/lib-sys/mutt_socket.c b/lib-sys/mutt_socket.c
index 78a609f..72473bc 100644
--- a/lib-sys/mutt_socket.c
+++ b/lib-sys/mutt_socket.c
@@ -9,23 +9,13 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <string.h>
-#include <errno.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "globals.h"
@@ -36,6 +26,9 @@
 #include "mutt_signal.h"
 #include "mutt_ssl.h"
 
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
 #include "mutt_idna.h"
 
 /* support for multiple socket connections */
@@ -88,7 +81,7 @@ int mutt_socket_read (CONNECTION * conn, char *buf, ssize_t len)
   return rc;
 }
 
-int mutt_socket_write_d (CONNECTION * conn, const char *buf, int dbg)
+int mutt_socket_write(CONNECTION * conn, const char *buf)
 {
   int rc;
   int len;
@@ -132,8 +125,7 @@ int mutt_socket_readchar (CONNECTION * conn, char *c)
   return 1;
 }
 
-int mutt_socket_readln_d (char *buf, ssize_t buflen, CONNECTION * conn,
-                          int dbg)
+int mutt_socket_readln(char *buf, ssize_t buflen, CONNECTION * conn)
 {
   char ch;
   ssize_t i;