From 3c70bc72d1dcb3433979e51fc1a9219fb407cf2d Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Fri, 30 Mar 2012 16:32:17 +0000
Subject: [PATCH] Removendo warnings em windows, incluindo suporte a sessoes em net_connect()

---
 pw3270.cbp            | 302 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------
 src/gtk/colors.c      |   5 -----
 src/lib3270/host.c    |   2 +-
 src/lib3270/telnet.c  | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------
 src/lib3270/telnetc.h |   2 +-
 5 files changed, 262 insertions(+), 314 deletions(-)

diff --git a/pw3270.cbp b/pw3270.cbp
index de7b6d9..a60ada9 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -9,8 +9,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Debug/" />
+				<Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Debug\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
@@ -20,8 +20,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Release/" />
+				<Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Release\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -35,7 +35,7 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
-			<Add directory="src/include" />
+			<Add directory="src\include" />
 		</Compiler>
 		<Linker>
 			<Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
@@ -45,283 +45,277 @@
 		<Unit filename="colors.conf" />
 		<Unit filename="configure.ac" />
 		<Unit filename="pw3270.spec.in" />
-		<Unit filename="src/gtk/Makefile.in" />
-		<Unit filename="src/gtk/actions.c">
+		<Unit filename="src\gtk\Makefile.in" />
+		<Unit filename="src\gtk\actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/colors.c">
+		<Unit filename="src\gtk\colors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/common/common.h" />
-		<Unit filename="src/gtk/common/config.c">
+		<Unit filename="src\gtk\common\common.h" />
+		<Unit filename="src\gtk\common\config.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/dialog.c">
+		<Unit filename="src\gtk\dialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/fonts.c">
+		<Unit filename="src\gtk\fonts.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/globals.h" />
-		<Unit filename="src/gtk/main.c">
+		<Unit filename="src\gtk\globals.h" />
+		<Unit filename="src\gtk\main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/mainwindow.c">
+		<Unit filename="src\gtk\mainwindow.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/print.c">
+		<Unit filename="src\gtk\print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/Makefile.in" />
-		<Unit filename="src/gtk/uiparser/accelerator.c">
+		<Unit filename="src\gtk\uiparser\Makefile.in" />
+		<Unit filename="src\gtk\uiparser\accelerator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/action.c">
+		<Unit filename="src\gtk\uiparser\action.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/menu.c">
+		<Unit filename="src\gtk\uiparser\menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/menubar.c">
+		<Unit filename="src\gtk\uiparser\menubar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/menuitem.c">
+		<Unit filename="src\gtk\uiparser\menuitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/parsefile.c">
+		<Unit filename="src\gtk\uiparser\parsefile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/parser.c">
+		<Unit filename="src\gtk\uiparser\parser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/parser.h" />
-		<Unit filename="src/gtk/uiparser/popup.c">
+		<Unit filename="src\gtk\uiparser\parser.h" />
+		<Unit filename="src\gtk\uiparser\popup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/private.h" />
-		<Unit filename="src/gtk/uiparser/script.c">
+		<Unit filename="src\gtk\uiparser\private.h" />
+		<Unit filename="src\gtk\uiparser\script.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/separator.c">
+		<Unit filename="src\gtk\uiparser\separator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/sources.mak" />
-		<Unit filename="src/gtk/uiparser/toolbar.c">
+		<Unit filename="src\gtk\uiparser\sources.mak" />
+		<Unit filename="src\gtk\uiparser\toolbar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/toolitem.c">
+		<Unit filename="src\gtk\uiparser\toolitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/clipboard.c">
+		<Unit filename="src\gtk\v3270\clipboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/draw.c">
+		<Unit filename="src\gtk\v3270\draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/genmarshal" />
-		<Unit filename="src/gtk/v3270/iocallback.c">
+		<Unit filename="src\gtk\v3270\genmarshal" />
+		<Unit filename="src\gtk\v3270\iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/keyboard.c">
+		<Unit filename="src\gtk\v3270\keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/mouse.c">
+		<Unit filename="src\gtk\v3270\mouse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/oia.c">
+		<Unit filename="src\gtk\v3270\oia.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/private.h" />
-		<Unit filename="src/gtk/v3270/sources.mak" />
-		<Unit filename="src/gtk/v3270/v3270.h" />
-		<Unit filename="src/gtk/v3270/widget.c">
+		<Unit filename="src\gtk\v3270\private.h" />
+		<Unit filename="src\gtk\v3270\sources.mak" />
+		<Unit filename="src\gtk\v3270\v3270.h" />
+		<Unit filename="src\gtk\v3270\widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/valgrind.suppression" />
-		<Unit filename="src/include/lib3270.h" />
-		<Unit filename="src/include/lib3270/action_table.h" />
-		<Unit filename="src/include/lib3270/actions.h" />
-		<Unit filename="src/include/lib3270/config.h.in" />
-		<Unit filename="src/include/lib3270/log.h" />
-		<Unit filename="src/include/lib3270/popup.h" />
-		<Unit filename="src/include/lib3270/selection.h" />
-		<Unit filename="src/include/lib3270/session.h" />
-		<Unit filename="src/include/pw3270.h" />
-		<Unit filename="src/include/rules.mak.in" />
-		<Unit filename="src/lib3270/3270ds.h" />
-		<Unit filename="src/lib3270/Makefile.in" />
-		<Unit filename="src/lib3270/X11keysym.h" />
-		<Unit filename="src/lib3270/XtGlue.c">
+		<Unit filename="src\gtk\valgrind.suppression" />
+		<Unit filename="src\include\lib3270.h" />
+		<Unit filename="src\include\lib3270\action_table.h" />
+		<Unit filename="src\include\lib3270\actions.h" />
+		<Unit filename="src\include\lib3270\config.h.in" />
+		<Unit filename="src\include\lib3270\log.h" />
+		<Unit filename="src\include\lib3270\popup.h" />
+		<Unit filename="src\include\lib3270\selection.h" />
+		<Unit filename="src\include\lib3270\session.h" />
+		<Unit filename="src\include\pw3270.h" />
+		<Unit filename="src\include\rules.mak.in" />
+		<Unit filename="src\lib3270\3270ds.h" />
+		<Unit filename="src\lib3270\Makefile.in" />
+		<Unit filename="src\lib3270\X11keysym.h" />
+		<Unit filename="src\lib3270\XtGlue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/actions.c">
+		<Unit filename="src\lib3270\actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/actionsc.h" />
-		<Unit filename="src/lib3270/ansi.c">
+		<Unit filename="src\lib3270\actionsc.h" />
+		<Unit filename="src\lib3270\ansi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ansic.h" />
-		<Unit filename="src/lib3270/api.h" />
-		<Unit filename="src/lib3270/apl.c">
+		<Unit filename="src\lib3270\ansic.h" />
+		<Unit filename="src\lib3270\api.h" />
+		<Unit filename="src\lib3270\apl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/aplc.h" />
-		<Unit filename="src/lib3270/appres.h" />
-		<Unit filename="src/lib3270/arpa_telnet.h" />
-		<Unit filename="src/lib3270/cg.h" />
-		<Unit filename="src/lib3270/charset.c">
+		<Unit filename="src\lib3270\aplc.h" />
+		<Unit filename="src\lib3270\appres.h" />
+		<Unit filename="src\lib3270\arpa_telnet.h" />
+		<Unit filename="src\lib3270\cg.h" />
+		<Unit filename="src\lib3270\charset.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/charsetc.h" />
-		<Unit filename="src/lib3270/childc.h" />
-		<Unit filename="src/lib3270/ctlr.c">
+		<Unit filename="src\lib3270\charsetc.h" />
+		<Unit filename="src\lib3270\childc.h" />
+		<Unit filename="src\lib3270\ctlr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ctlr.h" />
-		<Unit filename="src/lib3270/ctlrc.h" />
-		<Unit filename="src/lib3270/dialogc.h" />
-		<Unit filename="src/lib3270/fallbacks.c">
+		<Unit filename="src\lib3270\ctlr.h" />
+		<Unit filename="src\lib3270\ctlrc.h" />
+		<Unit filename="src\lib3270\dialogc.h" />
+		<Unit filename="src\lib3270\ft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft.c">
+		<Unit filename="src\lib3270\ft_cut.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_cut.c">
+		<Unit filename="src\lib3270\ft_cut_ds.h" />
+		<Unit filename="src\lib3270\ft_cutc.h" />
+		<Unit filename="src\lib3270\ft_dft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_cut_ds.h" />
-		<Unit filename="src/lib3270/ft_cutc.h" />
-		<Unit filename="src/lib3270/ft_dft.c">
+		<Unit filename="src\lib3270\ft_dft_ds.h" />
+		<Unit filename="src\lib3270\ft_dftc.h" />
+		<Unit filename="src\lib3270\ftc.h" />
+		<Unit filename="src\lib3270\globals.h" />
+		<Unit filename="src\lib3270\glue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_dft_ds.h" />
-		<Unit filename="src/lib3270/ft_dftc.h" />
-		<Unit filename="src/lib3270/ftc.h" />
-		<Unit filename="src/lib3270/globals.h" />
-		<Unit filename="src/lib3270/glue.c">
+		<Unit filename="src\lib3270\gluec.h" />
+		<Unit filename="src\lib3270\host.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/gluec.h" />
-		<Unit filename="src/lib3270/host.c">
+		<Unit filename="src\lib3270\hostc.h" />
+		<Unit filename="src\lib3270\icmdc.h" />
+		<Unit filename="src\lib3270\init.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/hostc.h" />
-		<Unit filename="src/lib3270/icmdc.h" />
-		<Unit filename="src/lib3270/init.c">
+		<Unit filename="src\lib3270\keypadc.h" />
+		<Unit filename="src\lib3270\kybd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/keypadc.h" />
-		<Unit filename="src/lib3270/kybd.c">
+		<Unit filename="src\lib3270\kybdc.h" />
+		<Unit filename="src\lib3270\localdefs.h" />
+		<Unit filename="src\lib3270\log.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/kybdc.h" />
-		<Unit filename="src/lib3270/localdefs.h" />
-		<Unit filename="src/lib3270/log.c">
+		<Unit filename="src\lib3270\macros.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/macros.c">
+		<Unit filename="src\lib3270\mkfb.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/mkfb.c">
+		<Unit filename="src\lib3270\objects.h" />
+		<Unit filename="src\lib3270\paste.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/objects.h" />
-		<Unit filename="src/lib3270/paste.c">
+		<Unit filename="src\lib3270\popupsc.h" />
+		<Unit filename="src\lib3270\print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/popupsc.h" />
-		<Unit filename="src/lib3270/print.c">
+		<Unit filename="src\lib3270\printc.h" />
+		<Unit filename="src\lib3270\printer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/printc.h" />
-		<Unit filename="src/lib3270/printer.c">
+		<Unit filename="src\lib3270\printerc.h" />
+		<Unit filename="src\lib3270\proxy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/printerc.h" />
-		<Unit filename="src/lib3270/proxy.c">
+		<Unit filename="src\lib3270\proxyc.h" />
+		<Unit filename="src\lib3270\resolver.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/proxyc.h" />
-		<Unit filename="src/lib3270/resolver.c">
+		<Unit filename="src\lib3270\resolverc.h" />
+		<Unit filename="src\lib3270\resources.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/resolverc.h" />
-		<Unit filename="src/lib3270/resources.c">
+		<Unit filename="src\lib3270\resources.h" />
+		<Unit filename="src\lib3270\rpq.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/resources.h" />
-		<Unit filename="src/lib3270/rpq.c">
+		<Unit filename="src\lib3270\savec.h" />
+		<Unit filename="src\lib3270\screen.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/savec.h" />
-		<Unit filename="src/lib3270/screen.c">
+		<Unit filename="src\lib3270\screen.h" />
+		<Unit filename="src\lib3270\screenc.h" />
+		<Unit filename="src\lib3270\scrollc.h" />
+		<Unit filename="src\lib3270\see.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/screen.h" />
-		<Unit filename="src/lib3270/screenc.h" />
-		<Unit filename="src/lib3270/scrollc.h" />
-		<Unit filename="src/lib3270/see.c">
+		<Unit filename="src\lib3270\seec.h" />
+		<Unit filename="src\lib3270\selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/seec.h" />
-		<Unit filename="src/lib3270/selection.c">
+		<Unit filename="src\lib3270\sf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/sf.c">
+		<Unit filename="src\lib3270\sfc.h" />
+		<Unit filename="src\lib3270\shlobj_missing.h" />
+		<Unit filename="src\lib3270\statusc.h" />
+		<Unit filename="src\lib3270\tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/sfc.h" />
-		<Unit filename="src/lib3270/shlobj_missing.h" />
-		<Unit filename="src/lib3270/statusc.h" />
-		<Unit filename="src/lib3270/tables.c">
+		<Unit filename="src\lib3270\tablesc.h" />
+		<Unit filename="src\lib3270\telnet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/tablesc.h" />
-		<Unit filename="src/lib3270/telnet.c">
+		<Unit filename="src\lib3270\telnetc.h" />
+		<Unit filename="src\lib3270\testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/telnetc.h" />
-		<Unit filename="src/lib3270/testprogram.c">
+		<Unit filename="src\lib3270\tn3270e.h" />
+		<Unit filename="src\lib3270\toggle.h" />
+		<Unit filename="src\lib3270\toggles.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/tn3270e.h" />
-		<Unit filename="src/lib3270/toggle.h" />
-		<Unit filename="src/lib3270/toggles.c">
+		<Unit filename="src\lib3270\togglesc.h" />
+		<Unit filename="src\lib3270\trace_ds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/togglesc.h" />
-		<Unit filename="src/lib3270/trace_ds.c">
+		<Unit filename="src\lib3270\trace_dsc.h" />
+		<Unit filename="src\lib3270\utf8.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/trace_dsc.h" />
-		<Unit filename="src/lib3270/utf8.c">
+		<Unit filename="src\lib3270\utf8c.h" />
+		<Unit filename="src\lib3270\util.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/utf8c.h" />
-		<Unit filename="src/lib3270/util.c">
+		<Unit filename="src\lib3270\utilc.h" />
+		<Unit filename="src\lib3270\w3misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/utilc.h" />
-		<Unit filename="src/lib3270/version.c">
+		<Unit filename="src\lib3270\w3miscc.h" />
+		<Unit filename="src\lib3270\widec.h" />
+		<Unit filename="src\lib3270\winvers.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/w3misc.c">
+		<Unit filename="src\lib3270\winversc.h" />
+		<Unit filename="src\lib3270\xio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/w3miscc.h" />
-		<Unit filename="src/lib3270/widec.h" />
-		<Unit filename="src/lib3270/winvers.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/lib3270/winversc.h" />
-		<Unit filename="src/lib3270/xio.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/lib3270/xioc.h" />
-		<Unit filename="src/lib3270/xl.h" />
-		<Unit filename="ui/00default.xml" />
-		<Unit filename="ui/99debug.xml" />
+		<Unit filename="src\lib3270\xioc.h" />
+		<Unit filename="src\lib3270\xl.h" />
+		<Unit filename="ui\00default.xml" />
+		<Unit filename="ui\99debug.xml" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/src/gtk/colors.c b/src/gtk/colors.c
index fcc0a9c..a123bb4 100644
--- a/src/gtk/colors.c
+++ b/src/gtk/colors.c
@@ -277,7 +277,6 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 			gtk_widget_set_sensitive(widget,TRUE);
 		}
 
-
 		g_key_file_free(conf);
 
 	}
@@ -387,11 +386,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 
  	const gchar * title  = g_object_get_data(G_OBJECT(action),"title");
 	GtkWidget	* dialog = gtk_dialog_new_with_buttons (	gettext(title ? title : N_( "Color setup") ),
-#if GTK_CHECK_VERSION(3,0,0)
 															NULL,
-#else
-															GTK_WINDOW(gtk_widget_get_toplevel(widget)),
-#endif // GTK(3,0,0)
 															GTK_DIALOG_DESTROY_WITH_PARENT,
 															GTK_STOCK_OK,		GTK_RESPONSE_ACCEPT,
 															GTK_STOCK_CANCEL,	GTK_RESPONSE_REJECT,
diff --git a/src/lib3270/host.c b/src/lib3270/host.c
index 4ee34a6..9bd48a7 100644
--- a/src/lib3270/host.c
+++ b/src/lib3270/host.c
@@ -569,7 +569,7 @@ static int do_connect(H3270 *hSession, const char *n)
 
 	/* Attempt contact. */
 	hSession->ever_3270 = False;
-	hSession->net_sock = net_connect(chost, port, localprocess_cmd != CN, &resolving,&pending);
+	hSession->net_sock = net_connect(hSession, chost, port, localprocess_cmd != CN, &resolving,&pending);
 
 	if (hSession->net_sock < 0 && !resolving)
 	{
diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c
index fb708e1..e13d142 100644
--- a/src/lib3270/telnet.c
+++ b/src/lib3270/telnet.c
@@ -353,8 +353,7 @@ static void output_possible(H3270 *session);
 
 
 #if defined(_WIN32) /*[*/
-void
-sockstart(void)
+void sockstart(H3270 *session)
 {
 	static int initted = 0;
 	WORD wVersionRequested;
@@ -367,15 +366,24 @@ sockstart(void)
 
 	wVersionRequested = MAKEWORD(2, 2);
 
-	if (WSAStartup(wVersionRequested, &wsaData) != 0) {
-		#warning Notify User
-		fprintf(stderr, "WSAStartup failed: %s\n",win32_strerror(GetLastError()));
+	if (WSAStartup(wVersionRequested, &wsaData) != 0)
+	{
+		lib3270_popup_dialog(	session,
+								LIB3270_NOTIFY_CRITICAL,
+								N_( "Network startup error" ),
+								N_( "WSAStartup failed" ),
+								"%s", win32_strerror(GetLastError()) );
+
 		_exit(1);
 	}
 
-	if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
-		#warning Notify User
-		fprintf(stderr, "Bad winsock version: %d.%d\n",LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion));
+	if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2)
+	{
+		lib3270_popup_dialog(	session,
+								LIB3270_NOTIFY_CRITICAL,
+								N_( "Network startup error" ),
+								N_( "Bad winsock version" ),
+								N_( "Can´t use winsock version %d.%d" ), LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion));
 		_exit(1);
 	}
 }
@@ -408,13 +416,18 @@ void popup_a_sockerr(H3270 *session, char *fmt, ...)
 
 }
 
-/*
- * net_connect
- *	Establish a telnet socket to the given host passed as an argument.
+/**
+ *  Establish a telnet socket to the given host passed as an argument.
+ *
  *	Called only once and is responsible for setting up the telnet
- *	variables.  Returns the file descriptor of the connected socket.
+ *	variables.
+ *
+ * @param session	Handle to the session descriptor.
+ *
+ *
+ * @return The file descriptor of the connected socket.
  */
-int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving, Boolean *pending)
+int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Boolean *resolving, Boolean *pending)
 {
 	struct servent	*sp;
 	struct hostent	*hp;
@@ -427,11 +440,11 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
 	int			mtu = OMTU;
 #endif /*]*/
 
-#	define close_fail	{ (void) SOCK_CLOSE(h3270.sock); h3270.sock = -1; return -1; }
+#define close_fail { (void) SOCK_CLOSE(session->sock); session->sock = -1; return -1; }
 
-#if defined(_WIN32) /*[*/
-	sockstart();
-#endif /*]*/
+#if defined(_WIN32)
+	sockstart(session);
+#endif
 
 	if (netrbuf == (unsigned char *)NULL)
 		netrbuf = (unsigned char *)Malloc(BUFSZ);
@@ -453,10 +466,10 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
 	*resolving = False;
 	*pending = False;
 
-	Replace(h3270.hostname, NewString(host));
+	Replace(session->hostname, NewString(host));
 
 	/* get the passthru host and port number */
-	if (h3270.passthru_host) {
+	if (session->passthru_host) {
 		const char *hn;
 
 		hn = getenv("INTERNET_HOST");
@@ -491,9 +504,9 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
 						"or service: %s", portname);
 					return -1;
 				}
-				h3270.current_port = ntohs(sp->s_port);
+				session->current_port = ntohs(sp->s_port);
 			} else
-				h3270.current_port = (unsigned short)lport;
+				session->current_port = (unsigned short)lport;
 		}
 		if (proxy_type < 0)
 		    	return -1;
@@ -501,199 +514,142 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
 
 	/* fill in the socket address of the given host */
 	(void) memset((char *) &haddr, 0, sizeof(haddr));
-	if (h3270.passthru_host) {
+	if (session->passthru_host) {
 		haddr.sin.sin_family = AF_INET;
 		(void) memmove(&haddr.sin.sin_addr, passthru_haddr,
 			       passthru_len);
 		haddr.sin.sin_port = passthru_port;
 		ha_len = sizeof(struct sockaddr_in);
 	} else if (proxy_type > 0) {
-			status_resolving(&h3270,1);
+			status_resolving(session,1);
 	    	if (resolve_host_and_port(proxy_host, proxy_portname,
 			    &proxy_port, &haddr.sa, &ha_len, errmsg,
 			    sizeof(errmsg)) < 0) {
 		    	popup_an_error(NULL,errmsg);
-				status_resolving(&h3270,0);
+				status_resolving(session,0);
 		    	return -1;
-			status_resolving(&h3270,0);
+			status_resolving(session,0);
 		}
 	} else {
-/*
-#if defined(LOCAL_PROCESS)
-		if (ls) {
-			local_process = True;
-		} else {
-#endif
-#if defined(LOCAL_PROCESS)
-			local_process = False;
-#endif
-*/
-			status_resolving(&h3270,1);
+			status_resolving(session,1);
 			if (resolve_host_and_port(host, portname,
-				    &h3270.current_port, &haddr.sa, &ha_len,
+				    &session->current_port, &haddr.sa, &ha_len,
 				    errmsg, sizeof(errmsg)) < 0) {
-			    	popup_an_error(NULL,errmsg);
+			    	popup_an_error(session,errmsg);
 					status_resolving(&h3270,0);
 			    	return -1;
-			status_resolving(&h3270,0);
+			status_resolving(session,0);
 			}
-/*
-#if defined(LOCAL_PROCESS)
-		}
-#endif
-*/
 	}
 
-/*
-#if defined(LOCAL_PROCESS)
-	if (local_process) {
-		int amaster;
-		struct winsize w;
-
-		w.ws_row = XMIT_ROWS;
-		w.ws_col = XMIT_COLS;
-		w.ws_xpixel = 0;
-		w.ws_ypixel = 0;
-
-		switch (forkpty(&amaster, NULL, NULL, &w)) {
-		    case -1:	// failed
-			popup_an_errno(errno, "forkpty");
-			close_fail;
-		    case 0:	// child
-			putenv("TERM=xterm");
-			if (strchr(host, ' ') != CN) {
-				(void) execlp("/bin/sh", "sh", "-c", host,
-				    NULL);
-			} else {
-				char *arg1;
-
-				arg1 = strrchr(host, '/');
-				(void) execlp(host,
-					(arg1 == CN) ? host : arg1 + 1,
-					NULL);
-			}
-			perror(host);
-			#warning Notify User
-			_exit(1);
-			break;
-		    default:	// parent
-			sock = amaster;
-#if !defined(_WIN32)
-			(void) fcntl(sock, F_SETFD, 1);
-#endif
-			net_connected();
-			host_in3270(CONNECTED_ANSI);
-			break;
-		}
-	} else {
-#endif
-*/
-		/* create the socket */
-		if ((h3270.sock = socket(haddr.sa.sa_family, SOCK_STREAM, 0)) == -1) {
-			popup_a_sockerr(NULL, N_( "socket" ) );
-			return -1;
-		}
+	/* create the socket */
+	if ((session->sock = socket(haddr.sa.sa_family, SOCK_STREAM, 0)) == -1) {
+		popup_a_sockerr(session, N_( "socket" ) );
+		return -1;
+	}
 
-		/* set options for inline out-of-band data and keepalives */
-		if (setsockopt(h3270.sock, SOL_SOCKET, SO_OOBINLINE, (char *)&on,
-			    sizeof(on)) < 0) {
-			popup_a_sockerr(NULL, N_( "setsockopt(%s)" ), "SO_OOBINLINE");
-			close_fail;
-		}
-		if (setsockopt(h3270.sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&on,
-			    sizeof(on)) < 0) {
-			popup_a_sockerr(NULL, N_( "setsockopt(%s)" ), "SO_KEEPALIVE");
-			close_fail;
-		}
+	/* set options for inline out-of-band data and keepalives */
+	if (setsockopt(session->sock, SOL_SOCKET, SO_OOBINLINE, (char *)&on,
+			sizeof(on)) < 0) {
+		popup_a_sockerr(session, N_( "setsockopt(%s)" ), "SO_OOBINLINE");
+		close_fail;
+	}
+	if (setsockopt(session->sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&on,
+			sizeof(on)) < 0) {
+		popup_a_sockerr(session, N_( "setsockopt(%s)" ), "SO_KEEPALIVE");
+		close_fail;
+	}
 #if defined(OMTU) /*[*/
-		if (setsockopt(h3270.sock, SOL_SOCKET, SO_SNDBUF, (char *)&mtu,
-			    sizeof(mtu)) < 0) {
-			popup_a_sockerr( N_( "setsockopt(%s)" ), "SO_SNDBUF");
-			close_fail;
-		}
+	if (setsockopt(session->sock, SOL_SOCKET, SO_SNDBUF, (char *)&mtu,sizeof(mtu)) < 0)
+	{
+		popup_a_sockerr(session, N_( "setsockopt(%s)" ), "SO_SNDBUF");
+		close_fail;
+	}
 #endif /*]*/
 
-		/* set the socket to be non-delaying */
+	/* set the socket to be non-delaying */
 #if defined(_WIN32) /*[*/
-		if (non_blocking(False) < 0)
+	if (non_blocking(False) < 0)
 #else /*][*/
-		if (non_blocking(True) < 0)
+	if (non_blocking(True) < 0)
 #endif /*]*/
-			close_fail;
+		close_fail;
 
 #if !defined(_WIN32) /*[*/
-		/* don't share the socket with our children */
-		(void) fcntl(h3270.sock, F_SETFD, 1);
+	/* don't share the socket with our children */
+	(void) fcntl(session->sock, F_SETFD, 1);
 #endif /*]*/
 
-		/* init ssl */
+	/* init ssl */
 #if defined(HAVE_LIBSSL) /*[*/
-		last_ssl_error = 0;
-		if (h3270.ssl_host)
-			ssl_init();
+	last_ssl_error = 0;
+	if (session->ssl_host)
+		ssl_init();
 #endif /*]*/
 
-		/* connect */
-		status_connecting(&h3270,1);
-		if (connect(h3270.sock, &haddr.sa, ha_len) == -1) {
-			if (socket_errno() == SE_EWOULDBLOCK
+	/* connect */
+	status_connecting(session,1);
+	if (connect(session->sock, &haddr.sa, ha_len) == -1) {
+		if (socket_errno() == SE_EWOULDBLOCK
 #if defined(SE_EINPROGRESS) /*[*/
-			    || socket_errno() == SE_EINPROGRESS
+			|| socket_errno() == SE_EINPROGRESS
 #endif /*]*/
 						   ) {
-				trace_dsn("Connection pending.\n");
-				*pending = True;
+			trace_dsn("Connection pending.\n");
+			*pending = True;
 #if !defined(_WIN32) /*[*/
-				output_id = AddOutput(h3270.sock, &h3270, output_possible);
+			output_id = AddOutput(session->sock, session, output_possible);
 #endif /*]*/
-			} else {
-				popup_a_sockerr(NULL, N_( "Can't connect to %s:%d" ),h3270.hostname, h3270.current_port);
-				close_fail;
-			}
 		} else {
-			if (non_blocking(False) < 0)
-				close_fail;
-			net_connected(&h3270);
+			popup_a_sockerr(session, N_( "Can't connect to %s:%d" ),session->hostname, session->current_port);
+			close_fail;
 		}
-/*
-#if defined(LOCAL_PROCESS)
+	} else {
+		if (non_blocking(False) < 0)
+			close_fail;
+		net_connected(session);
 	}
-#endif
-*/
 
 	/* set up temporary termtype */
-	if (appres.termname == CN && h3270.std_ds_host) {
+	if (appres.termname == CN && session->std_ds_host) {
 		(void) sprintf(ttype_tmpval, "IBM-327%c-%d",
-		    appres.m3279 ? '9' : '8', h3270.model_num);
-		h3270.termtype = ttype_tmpval;
+		    appres.m3279 ? '9' : '8', session->model_num);
+		session->termtype = ttype_tmpval;
 	}
 
 	/* all done */
 #if defined(_WIN32) /*[*/
-	if (h3270.sock_handle == NULL) {
+	if (session->sock_handle == NULL) {
 		char ename[256];
 
 		sprintf(ename, "wc3270-%d", getpid());
 
-		h3270.sock_handle = CreateEvent(NULL, TRUE, FALSE, ename);
-		if (h3270.sock_handle == NULL)
+		session->sock_handle = CreateEvent(NULL, TRUE, FALSE, ename);
+		if (session->sock_handle == NULL)
 		{
-			#warning Notify User
-			Log("Cannot create socket handle: %s\n",win32_strerror(GetLastError()));
+			lib3270_popup_dialog(	session,
+									LIB3270_NOTIFY_CRITICAL,
+									N_( "Network startup error" ),
+									N_( "Cannot create socket handle" ),
+									"%s", win32_strerror(GetLastError()) );
+
 			_exit(1);
 		}
 	}
 
-	if (WSAEventSelect(h3270.sock, h3270.sock_handle, FD_READ | FD_CONNECT | FD_CLOSE) != 0)
+	if (WSAEventSelect(session->sock, session->sock_handle, FD_READ | FD_CONNECT | FD_CLOSE) != 0)
 	{
-		#warning Notify User
-		Log("WSAEventSelect failed: %s\n",win32_strerror(GetLastError()));
+		lib3270_popup_dialog(	session,
+								LIB3270_NOTIFY_CRITICAL,
+								N_( "Network startup error" ),
+								N_( "WSAEventSelect failed" ),
+								"%s", win32_strerror(GetLastError()) );
 		_exit(1);
 	}
 
-	return (int) h3270.sock_handle;
+	return (int) session->sock_handle;
 #else /*][*/
-	return h3270.sock;
+	return session->sock;
 #endif /*]*/
 }
 #undef close_fail
@@ -953,8 +909,11 @@ void net_input(H3270 *session)
 				case WSAEINVAL:
 					return;
 				default:
-					#warning Notify User!
-					Log("second connect() failed: %s\n",win32_strerror(err));
+					lib3270_popup_dialog(	&h3270,
+											LIB3270_NOTIFY_CRITICAL,
+											N_( "Network startup error" ),
+											N_( "Second connect() failed" ),
+											"%s", win32_strerror(GetLastError()) );
 					_exit(1);
 				}
 			}
diff --git a/src/lib3270/telnetc.h b/src/lib3270/telnetc.h
index dc3c25b..9a1d384 100644
--- a/src/lib3270/telnetc.h
+++ b/src/lib3270/telnetc.h
@@ -34,7 +34,7 @@ LIB3270_INTERNAL Boolean net_add_dummy_tn3270e(void);
 LIB3270_INTERNAL void net_add_eor(unsigned char *buf, int len);
 LIB3270_INTERNAL void net_break(void);
 LIB3270_INTERNAL void net_charmode(void);
-LIB3270_INTERNAL int net_connect(const char *, char *, Boolean, Boolean *, Boolean *);
+LIB3270_INTERNAL int net_connect(H3270 *session, const char *, char *, Boolean, Boolean *, Boolean *);
 LIB3270_INTERNAL void net_disconnect(void);
 LIB3270_INTERNAL void net_exception(H3270 *session);
 LIB3270_INTERNAL void net_hexansi_out(unsigned char *buf, int len);
--
libgit2 0.21.2