diff src/proxy.c @ 5872:059d95c67cda

[gaim-migrate @ 6304] The legendary Header File Cleanup! Files now only include what they need. This should reduce the number of files that must recompile when a header file changes. It's a lot nicer. Trust me on it. I also added a couple new header files. I hope I didn't break TOO much! committer: Tailor Script <[e-mail]>

--- a/src/proxy.c	Sat Jun 14 21:34:31 2003 +0000
+++ b/src/proxy.c	Sat Jun 14 23:21:02 2003 +0000
@@ -27,35 +27,11 @@
 /* it is intended to : 1st handle http proxy, using the CONNECT command
  , 2nd provide an easy way to add socks support */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#ifndef _WIN32
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <signal.h>
-#else
-#include <winsock.h>
-#endif
-
-#include <fcntl.h>
-#include <errno.h>
-#include "gaim.h"
+#include "internal.h"
+#include "debug.h"
+#include "prefs.h"
 #include "proxy.h"
-#include "prefs.h"
-
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
+#include "util.h"
 
 #define GAIM_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
 #define GAIM_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
@@ -63,6 +39,8 @@
 static GaimProxyInfo *global_proxy_info = NULL;
 static gboolean global_proxy_info_from_prefs = FALSE;
 
+static int opt_debug = 0;
+
 struct PHB {
 	GaimInputFunction func;
 	gpointer data;
@@ -597,7 +575,7 @@
 					FD_SET(child_in[0], &fds);
 					rc = select(child_in[0]+1, &fds, NULL, NULL, &tv);
 					if(!rc) {
-						if(opt_debug)
+						if (opt_debug)
 							fprintf(stderr,"dns[%d]: nobody needs me... =(\n", getpid());
 						break;
 					}
@@ -1392,7 +1370,7 @@
 	unsigned int len;
 	int error = ETIMEDOUT;
 
-	gaim_debug(GAIM_INFO, "socks5 proxy", "Connected.\n");
+	gaim_debug(GAIM_DEBUG_INFO, "socks5 proxy", "Connected.\n");
 
 	if (phb->inpa > 0)
 		gaim_input_remove(phb->inpa);