diff --git a/Makefile.in b/Makefile.in
index 0dc6ee9..1cb1a93 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,6 +71,7 @@ HELP2MAN=@HELP2MAN@
 all: \
 	$(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
 	$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
+	$(BINRLS)/libpw3270cpp.a \
 	$(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \
 	locale/$(PACKAGE_TARNAME).pot
 
@@ -82,26 +83,12 @@ application: \
 	$(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
 	$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
 
+$(BINRLS)/libpw3270cpp.a: \
+	src/libpw3270cpp/*
 
-#---[ Debug Rules ]----------------------------------------------------------------------
+	@$(MAKE) -C src/libpw3270cpp Release
 
-#$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \
-#	modules/lib3270/* \
-#	modules/lib3270/src/lib3270/* \
-#	modules/lib3270/src/include/* \
-#	modules/lib3270/src/include/lib3270/*
-#
-#	@$(MKDIR) `dirname $@`
-#	@$(MAKE) -C modules/lib3270 $@
-
-#$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
-#	modules/libv3270/* \
-#	modules/libv3270/src/v3270/* \
-#	modules/libv3270/src/include/* \
-#	modules/libv3270/src/include/v3270/* \
-#
-#	@$(MKDIR) `dirname $@`
-#	@$(MAKE) -C modules/libv3270 $@
+#---[ Debug Rules ]----------------------------------------------------------------------
 
 $(BINDBG)/%@EXEEXT@: \
 	$(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
@@ -112,30 +99,13 @@ $(BINDBG)/%@EXEEXT@: \
 
 $(BINDBG)/plugins/%@DLLEXT@: \
 	$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
+	$(BINDBG)/libpw3270cpp.a \
 	src/plugins/%/*
 
 	@$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
 
 #---[ Release Rules ]--------------------------------------------------------------------
 
-#$(BINRLS)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \
-#	modules/lib3270/* \
-#	modules/lib3270/src/lib3270/* \
-#	modules/lib3270/src/include/* \
-#	modules/lib3270/src/include/lib3270/*
-#
-#	@$(MKDIR) `dirname $@`
-#	@$(MAKE) -C modules/lib3270 $@
-
-#$(BINRLS)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
-#	modules/libv3270/* \
-#	modules/libv3270/src/v3270/* \
-#	modules/libv3270/src/include/* \
-#	modules/libv3270/src/include/v3270/* \
-#
-#	@$(MKDIR) `dirname $@`
-#	@$(MAKE) -C modules/libv3270 $@
-
 $(BINRLS)/%@EXEEXT@: \
 	$(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
         src/% \
@@ -145,6 +115,7 @@ $(BINRLS)/%@EXEEXT@: \
 
 $(BINRLS)/plugins/%@DLLEXT@: \
 	$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
+	$(BINRLS)/libpw3270cpp.a \
 	src/plugins/%/*
  
 	@$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
@@ -163,11 +134,6 @@ publish-release: \
 		~/public_html/release-$(PACKAGE_TARNAME)-@host_cpu@.zip \
 		$(BINRLS)/*
 
-run: \
-	$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
-
-	@LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
-
 #---[ Install Rules ]--------------------------------------------------------------------
 
 install: \
@@ -274,6 +240,11 @@ publish-debug: \
 		~/public_html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip \
 		$(BINDBG)/*
 
+$(BINDBG)/libpw3270cpp.a: \
+	src/libpw3270cpp/*
+
+	@$(MAKE) -C src/libpw3270cpp Debug
+
 run: \
 	$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
 
diff --git a/configure.ac b/configure.ac
index 09def00..f2eeafc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,7 @@ case "$host" in
 		AC_CONFIG_FILES(win/$PACKAGE_TARNAME.nsi)
 		AC_CONFIG_FILES(src/pw3270/resources.rc)
 
-dnl		PLUGINS="$PLUGINS hllapi"
+		PLUGINS="$PLUGINS hllapi"
 
 		if test "$host_cpu" = "x86_64"; then
 			app_cv_programfiles="PROGRAMFILES64"
@@ -519,6 +519,7 @@ dnl ---------------------------------------------------------------------------
 AC_CONFIG_FILES(src/pw3270/Makefile)
 AC_CONFIG_FILES(src/pw3270/uiparser/Makefile)
 AC_CONFIG_FILES(src/pw3270/common/Makefile)
+
 AC_CONFIG_FILES(src/libpw3270cpp/Makefile)
 
 AC_CONFIG_FILES(ui/Makefile)
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index 01dcb48..64942ab 100644
--- a/locale/pw3270.pot
+++ b/locale/pw3270.pot
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: properties.c:69 properties.c:76 properties.c:83 properties.c:104
-#: properties.c:111 properties.c:118 properties.c:125 properties.c:139
-#: properties.c:146
 #, fuzzy
 msgid ""
 msgstr ""
 "#-#-#-#-#  pw3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-30 14:50-0200\n"
+"POT-Creation-Date: 2019-02-01 14:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +20,7 @@ msgstr ""
 "#-#-#-#-#  lib3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-30 15:56+0000\n"
+"POT-Creation-Date: 2019-02-01 13:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,7 +31,7 @@ msgstr ""
 "#-#-#-#-#  libv3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-30 15:58+0000\n"
+"POT-Creation-Date: 2019-02-01 13:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,25 +50,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  dbus3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-30 14:50-0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
 
 #: window.c:399
 #, c-format
 msgid " and <b>%s</b> for %s."
 msgstr ""
 
-#: telnet.c:688 iocalls.c:563 iocalls.c:580 linux/connect.c:83
-#: linux/connect.c:99
+#: telnet.c:688 iocalls.c:563 iocalls.c:580 linux/connect.c:81
+#: linux/connect.c:97
 #, c-format
 msgid "%s"
 msgstr ""
@@ -101,7 +87,7 @@ msgstr ""
 msgid "%s action needs src attribute"
 msgstr ""
 
-#: main.c:93
+#: main.c:97
 #, c-format
 msgid "%s requires GTK version %d.%d.%d"
 msgstr ""
@@ -141,7 +127,7 @@ msgstr ""
 msgid "%s<b>%s</b> for %s"
 msgstr ""
 
-#: main.c:324
+#: main.c:380
 msgid "- 3270 Emulator for Gtk"
 msgstr ""
 
@@ -149,7 +135,7 @@ msgstr ""
 msgid "16 colors"
 msgstr ""
 
-#: screen.c:766 screen.c:803 screen.c:821 screen.c:946
+#: screen.c:782 screen.c:819 screen.c:837 screen.c:962
 msgid "3270 Error"
 msgstr ""
 
@@ -157,7 +143,7 @@ msgstr ""
 msgid "3270 File transfer"
 msgstr ""
 
-#: screen.c:784
+#: screen.c:800
 msgid "3270 Warning"
 msgstr ""
 
@@ -223,7 +209,7 @@ msgstr ""
 msgid "<b>SSL state is undefined</b>Unexpected SSL status %ld"
 msgstr ""
 
-#: main.c:344
+#: main.c:400
 msgid ""
 "<b>Valid options:</b>\n"
 "\n"
@@ -259,7 +245,7 @@ msgstr ""
 msgid "Aborting..."
 msgstr ""
 
-#: src/dialogs/security.c:189
+#: src/dialogs/security.c:194
 msgid "About security"
 msgstr ""
 
@@ -309,6 +295,10 @@ msgstr ""
 msgid "Appends the source file to the destination file."
 msgstr ""
 
+#: main.c:369
+msgid "Application name"
+msgstr ""
+
 #: 10keypad.xml:85
 msgid "Attn"
 msgstr ""
@@ -421,7 +411,7 @@ msgstr ""
 msgid "C_onnect"
 msgstr ""
 
-#: toggles.c:333 linux/connect.c:278
+#: toggles.c:333 linux/connect.c:229
 #, c-format
 msgid "Can't %s network keep-alive"
 msgstr ""
@@ -435,20 +425,16 @@ msgstr ""
 msgid "Can't bind to LDAP server"
 msgstr ""
 
-#: linux/connect.c:91
+#: linux/connect.c:89
 #, c-format
 msgid "Can't connect to %s"
 msgstr ""
 
-#: linux/connect.c:225
+#: linux/connect.c:179
 #, c-format
 msgid "Can't connect to %s:%s"
 msgstr ""
 
-#: main.c:72
-msgid "Can't connect to DBUS server"
-msgstr ""
-
 #: src/v3270/selection.c:463
 #, c-format
 msgid "Can't convert line %lu from %s to %s"
@@ -462,10 +448,6 @@ msgstr ""
 msgid "Can't get CRL from LDAP Search"
 msgstr ""
 
-#: main.c:117
-msgid "Can't get DBUS object name"
-msgstr ""
-
 #: ssl/linux/getcrl.c:357 ssl/linux/getcrl.c:368
 msgid "Can't get LDAP attribute"
 msgstr ""
@@ -713,15 +695,11 @@ msgstr ""
 msgid "Connect on startup"
 msgstr ""
 
-#: gobject.c:201
-msgid "Connecting to host"
-msgstr ""
-
-#: iocalls.c:547 linux/connect.c:229 linux/connect.c:264 linux/connect.c:282
+#: iocalls.c:547 linux/connect.c:183 linux/connect.c:215 linux/connect.c:233
 msgid "Connection error"
 msgstr ""
 
-#: linux/connect.c:97
+#: linux/connect.c:95
 msgid "Connection failed"
 msgstr ""
 
@@ -1009,7 +987,7 @@ msgstr ""
 msgid "Function bar"
 msgstr ""
 
-#: main.c:97 main.c:394
+#: main.c:101 main.c:476
 msgid "GTK Version mismatch"
 msgstr ""
 
@@ -1061,11 +1039,11 @@ msgstr ""
 msgid "Host rejected resource(s)"
 msgstr ""
 
-#: main.c:306
+#: main.c:360
 msgid "Host system type"
 msgstr ""
 
-#: main.c:304
+#: main.c:358
 msgid "Host to connect"
 msgstr ""
 
@@ -1181,18 +1159,30 @@ msgstr ""
 msgid "Invalid session handler"
 msgstr ""
 
-#: src/dialogs/security.c:170
+#: src/dialogs/security.c:175
 msgid "Invalid state"
 msgstr ""
 
+#: properties.c:83
+msgid "Is connection secure"
+msgstr ""
+
 #: properties.c:167
 msgid "Is starting (no first screen)?"
 msgstr ""
 
+#: properties.c:76
+msgid "Is terminal connected"
+msgstr ""
+
 #: properties.c:153
 msgid "Is terminal in the INITIAL_E state?"
 msgstr ""
 
+#: properties.c:69
+msgid "Is terminal ready"
+msgstr ""
+
 #: 80javasamples.xml:38
 msgid "Java"
 msgstr ""
@@ -1225,7 +1215,7 @@ msgstr ""
 msgid "Load queue from file"
 msgstr ""
 
-#: config.c:423
+#: config.c:430
 #, c-format
 msgid "Loading %s"
 msgstr ""
@@ -1234,11 +1224,11 @@ msgstr ""
 msgid "Local:"
 msgstr ""
 
-#: main.c:319
+#: main.c:375
 msgid "Log to file"
 msgstr ""
 
-#: main.c:312
+#: main.c:366
 msgid "Minutes for auto-disconnect"
 msgstr ""
 
@@ -1271,7 +1261,7 @@ msgstr ""
 msgid "Mustard"
 msgstr ""
 
-#: telnet.c:354 linux/event_dispatcher.c:144 linux/connect.c:81
+#: telnet.c:354 linux/event_dispatcher.c:144 linux/connect.c:79
 msgid "Network error"
 msgstr ""
 
@@ -1493,7 +1483,7 @@ msgstr ""
 msgid "PF9"
 msgstr ""
 
-#: main.c:342
+#: main.c:398
 msgid "Parse error"
 msgstr ""
 
@@ -1522,7 +1512,7 @@ msgstr ""
 msgid "Path and name of the local file"
 msgstr ""
 
-#: main.c:313
+#: main.c:367
 msgid "Path for plugin files"
 msgstr ""
 
@@ -1530,7 +1520,7 @@ msgstr ""
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: src/dialogs/security.c:122 src/dialogs/security.c:141
+#: src/dialogs/security.c:127 src/dialogs/security.c:146
 msgid "Peer certificate"
 msgstr ""
 
@@ -1716,7 +1706,7 @@ msgstr ""
 msgid "Remap Failed"
 msgstr ""
 
-#: main.c:310
+#: main.c:364
 msgid "Remap charset from xml file"
 msgstr ""
 
@@ -1762,7 +1752,7 @@ msgstr ""
 msgid "Return"
 msgstr ""
 
-#: src/dialogs/security.c:128
+#: src/dialogs/security.c:133
 msgid "Revocation list"
 msgstr ""
 
@@ -1953,7 +1943,7 @@ msgstr ""
 msgid "Send file"
 msgstr ""
 
-#: main.c:316
+#: main.c:372
 msgid "Send messages to syslog"
 msgstr ""
 
@@ -1969,11 +1959,11 @@ msgstr ""
 msgid "Sending file"
 msgstr ""
 
-#: main.c:299 main.c:301
+#: main.c:353 main.c:355
 msgid "Session name"
 msgstr ""
 
-#: main.c:309
+#: main.c:363
 msgid "Set host charset"
 msgstr ""
 
@@ -1981,19 +1971,19 @@ msgstr ""
 msgid "Set insert mode"
 msgstr ""
 
-#: main.c:305
+#: main.c:359
 msgid "Set reported colors (8/16)"
 msgstr ""
 
-#: main.c:308
+#: main.c:362
 msgid "Set toggles OFF"
 msgstr ""
 
-#: main.c:307
+#: main.c:361
 msgid "Set toggles ON"
 msgstr ""
 
-#: main.c:318
+#: main.c:374
 msgid "Set trace filename"
 msgstr ""
 
@@ -2078,11 +2068,6 @@ msgstr ""
 msgid "Starting"
 msgstr ""
 
-#: gobject.c:189
-#, c-format
-msgid "State %04d can't accept requests"
-msgstr ""
-
 #: properties.c:132
 msgid "State is 3270, TN3270e or SSCP"
 msgstr ""
@@ -2297,7 +2282,7 @@ msgstr ""
 msgid "The model number"
 msgstr ""
 
-#: main.c:311
+#: main.c:365
 msgid "The model of 3270 display to be emulated"
 msgstr ""
 
@@ -2360,7 +2345,7 @@ msgstr ""
 msgid "There's no available settings for charset \"%s\""
 msgstr ""
 
-#: src/dialogs/security.c:177
+#: src/dialogs/security.c:182
 msgid "There's no security information in the session"
 msgstr ""
 
@@ -2385,7 +2370,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02111-1307 USA"
 msgstr ""
 
-#: main.c:390
+#: main.c:472
 #, c-format
 msgid "This program requires GTK version %d.%d.%d"
 msgstr ""
@@ -2514,7 +2499,7 @@ msgstr ""
 msgid "Unable to get certificate CRL."
 msgstr ""
 
-#: linux/connect.c:82
+#: linux/connect.c:80
 msgid "Unable to get connection state."
 msgstr ""
 
@@ -2574,7 +2559,7 @@ msgstr ""
 msgid "Unexpected or invalid attribute value \"%s\""
 msgstr ""
 
-#: main.c:153
+#: main.c:157
 #, c-format
 msgid "Unexpected or invalid color value \"%s\""
 msgstr ""
@@ -2583,11 +2568,6 @@ msgstr ""
 msgid "Unexpected or unknown security status"
 msgstr ""
 
-#: gobject.c:204
-#, c-format
-msgid "Unexpected state %04d"
-msgstr ""
-
 #: actions.c:416
 #, c-format
 msgid "Unexpected target \"%s\""
@@ -2793,7 +2773,7 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
-#: src/dialogs/security.c:192
+#: src/dialogs/security.c:197
 msgid "_Close"
 msgstr ""
 
@@ -2894,7 +2874,7 @@ msgstr ""
 msgid "connected"
 msgstr ""
 
-#: toggles.c:333 linux/connect.c:278
+#: toggles.c:333 linux/connect.c:229
 msgid "disable"
 msgstr ""
 
@@ -2902,7 +2882,7 @@ msgstr ""
 msgid "disconnected"
 msgstr ""
 
-#: toggles.c:333 linux/connect.c:278
+#: toggles.c:333 linux/connect.c:229
 msgid "enable"
 msgstr ""
 
@@ -2922,7 +2902,7 @@ msgstr ""
 msgid "lib3270 version"
 msgstr ""
 
-#: linux/connect.c:265
+#: linux/connect.c:216
 msgid "setsockopt(SO_OOBINLINE) has failed"
 msgstr ""
 
diff --git a/src/include/pw3270cpp.h b/src/include/pw3270cpp.h
index 1c1b0f1..3a1b4e3 100644
--- a/src/include/pw3270cpp.h
+++ b/src/include/pw3270cpp.h
@@ -117,7 +117,7 @@
 #endif // _WIN32
 
 	public:
-		module(const char *name, const char *version = NULL) throw (std::exception);
+		module(const char *name, const char *version = NULL);
 		~module();
 
 		void * get_symbol(const char *name);
@@ -291,7 +291,7 @@
 
 		static session	* (*factory)(const char *name);
 
-		static session	* create_remote(const char *name) throw (std::exception);
+		static session	* create_remote(const char *name);
 
 #ifdef HAVE_ICONV
 		iconv_t			  conv2Local;
diff --git a/src/libpw3270cpp/Makefile.in b/src/libpw3270cpp/Makefile.in
index c5be126..9fced80 100644
--- a/src/libpw3270cpp/Makefile.in
+++ b/src/libpw3270cpp/Makefile.in
@@ -59,12 +59,26 @@ VALGRIND=@VALGRIND@
 INSTALL_DATA=@INSTALL_DATA@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 
-CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @DBUS_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
-LIBS=@LIBS@ @DBUS_LIBS@ @LIBICONV@
+CFLAGS= \
+	@CFLAGS@ \
+	-Wno-deprecated-declarations \
+	-I$(BASEDIR)/src/include \
+	@LIB3270_CFLAGS@ \
+	@DBUS_CFLAGS@ \
+	@GTK_CFLAGS@
+
+LIBS= \
+	@LIBS@ \
+	@DBUS_LIBS@ \
+	@LIBICONV@
 
 #---[ Rules ]----------------------------------------------------------------------------
 
-DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h $(BASEDIR)/src/include/pw3270/*.h *.h Makefile
+DEPENDS=\
+	$(BASEDIR)/src/include/*.h \
+	$(BASEDIR)/src/include/pw3270/*.h \
+	*.h \
+	Makefile
 
 $(OBJDBG)/%.o: \
 	%.cc \
@@ -72,10 +86,11 @@ $(OBJDBG)/%.o: \
 
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
-	@$(CC) $(CFLAGS) \
-				@DBG_CFLAGS@ \
-				-DBUILD_DATE=`date +"%Y%m%d"`\
-				-o $@ -c $<
+	@$(CC) \
+		$(CFLAGS) \
+		@DBG_CFLAGS@ \
+		-DBUILD_DATE=`date +"%Y%m%d"`\
+		-o $@ -c $<
 
 $(OBJRLS)/%.o: \
 	%.cc \
@@ -84,9 +99,9 @@ $(OBJRLS)/%.o: \
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
 	@$(CC) $(CFLAGS) \
-				@RLS_CFLAGS@ \
-				-DBUILD_DATE=`date +"%Y%m%d"` \
-				-o $@ -c $<
+		@RLS_CFLAGS@ \
+		-DBUILD_DATE=`date +"%Y%m%d"` \
+		-o $@ -c $<
 
 $(POTDIR)/%.pot: %.c
 
diff --git a/src/libpw3270cpp/local.cc b/src/libpw3270cpp/local.cc
index 538fc1a..10c835b 100644
--- a/src/libpw3270cpp/local.cc
+++ b/src/libpw3270cpp/local.cc
@@ -262,7 +262,7 @@
 
 	public:
 
-		local() throw(std::exception) : module("lib3270",PACKAGE_VERSION)
+		local() : module("lib3270",PACKAGE_VERSION)
 		{
 		}
 
@@ -545,7 +545,7 @@
 
  	};
 
-	session	* session::create_local(void) throw (std::exception)
+	session	* session::create_local(void)
 	{
 		class obj : public local {
 		public:
@@ -590,7 +590,7 @@
 		return new obj();
 	}
 
-	session	* session::create_local(H3270 *hSession) throw (std::exception)
+	session	* session::create_local(H3270 *hSession)
 	{
 		class obj : public local {
 		public:
diff --git a/src/libpw3270cpp/module.cc b/src/libpw3270cpp/module.cc
index 71c2b9e..f821ac5 100644
--- a/src/libpw3270cpp/module.cc
+++ b/src/libpw3270cpp/module.cc
@@ -74,7 +74,7 @@ namespace PW3270_NAMESPACE
 	}
 #endif // _WIN32
 
-	module::module(const char *name, const char *version) throw (std::exception)
+	module::module(const char *name, const char *version)
 	{
 		string dllname = name;
 
diff --git a/src/libpw3270cpp/private.h b/src/libpw3270cpp/private.h
index 6e50ae7..edd4096 100644
--- a/src/libpw3270cpp/private.h
+++ b/src/libpw3270cpp/private.h
@@ -111,7 +111,7 @@
 	 namespace PW3270_NAMESPACE
 	 {
 
-		session	* create_service_client(const char *session) throw (std::exception);
+		session	* create_service_client(const char *session);
 
 	 }
 
diff --git a/src/libpw3270cpp/remote.cc b/src/libpw3270cpp/remote.cc
index 1c17387..7153949 100644
--- a/src/libpw3270cpp/remote.cc
+++ b/src/libpw3270cpp/remote.cc
@@ -507,7 +507,7 @@
 
 #endif // defined
 
-		remote(const char *session) throw (std::exception)
+		remote(const char *session)
 		{
 #if defined(_WIN32)
 			static DWORD			  dwMode = PIPE_READMODE_MESSAGE;
@@ -1654,7 +1654,7 @@
 
  	};
 
-	session	* session::create_remote(const char *session) throw (std::exception)
+	session	* session::create_remote(const char *session)
 	{
 		debug("create(%s)",session);
 
diff --git a/src/libpw3270cpp/service.cc b/src/libpw3270cpp/service.cc
index ac4816d..4bd67f9 100644
--- a/src/libpw3270cpp/service.cc
+++ b/src/libpw3270cpp/service.cc
@@ -268,7 +268,7 @@
 		}
 
 	public:
-		client(const char *session) throw (std::exception)
+		client(const char *session)
 		{
 			DBusError err;
 
@@ -613,7 +613,7 @@
 
 	};
 
-	session	* create_service_client(const char *session) throw (std::exception)
+	session	* create_service_client(const char *session)
 	{
 		return new client(session);
 	}
diff --git a/src/libpw3270cpp/session.cc b/src/libpw3270cpp/session.cc
index 9358afd..ee45211 100644
--- a/src/libpw3270cpp/session.cc
+++ b/src/libpw3270cpp/session.cc
@@ -164,7 +164,7 @@
 	}
 
 	// Factory methods and settings
-	session	* session::create(const char *name) throw (std::exception)
+	session	* session::create(const char *name)
 	{
 		session	*rc = nullptr;
 
diff --git a/src/plugins/hllapi/Makefile.in b/src/plugins/hllapi/Makefile.in
index 431a98b..68bf654 100644
--- a/src/plugins/hllapi/Makefile.in
+++ b/src/plugins/hllapi/Makefile.in
@@ -66,11 +66,26 @@ INSTALL_DATA=@INSTALL_DATA@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 LN_S=@LN_S@
 
-CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -I$(BASEDIR)/src/include
+CFLAGS=\
+	@CFLAGS@ \
+	@LIBV3270_CFLAGS@ \
+	@GTK_CFLAGS@ \
+	-I$(BASEDIR)/src/include
 
 LIBS=@LIBS@ 
-API_LIBS=$(LIBS) -lpw3270cpp @LIBICONV@
-PLUGIN_LIBS=$(LIBS) @GTK_LIBS@ @GLIB_LIBS@ @LIB3270_LIBS@ @PW3270_LIBS@
+
+API_LIBS=\
+	$(LIBS) \
+	-lpw3270cpp \
+	@LIBICONV@
+
+PLUGIN_LIBS=\
+	$(LIBS) \
+	@GTK_LIBS@ \
+	@GLIB_LIBS@ \
+	@LIB3270_LIBS@ \
+	@LIBV3270_LIBS@ \
+	@PW3270_LIBS@
 
 #---[ Rules ]----------------------------------------------------------------------------
 
@@ -83,9 +98,9 @@ $(OBJDBG)/%.o: \
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
 	@$(CC) $(CFLAGS) \
-				@DBG_CFLAGS@ \
-				-DBUILD_DATE=`date +"0x%Y%m%d"`\
-				-o $@ -c $<
+		@DBG_CFLAGS@ \
+		-DBUILD_DATE=`date +"0x%Y%m%d"`\
+		-o $@ -c $<
 
 $(OBJDBG)/%.o: \
 	%.cc \
@@ -94,9 +109,9 @@ $(OBJDBG)/%.o: \
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(CFLAGS) \
-				@DBG_CFLAGS@ \
-				-DBUILD_DATE=`date +"0x%Y%m%d"`\
-				-o $@ -c $<
+		@DBG_CFLAGS@ \
+		-DBUILD_DATE=`date +"0x%Y%m%d"`\
+		-o $@ -c $<
 
 $(OBJRLS)/%.o: \
 	%.c \
@@ -105,9 +120,9 @@ $(OBJRLS)/%.o: \
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
 	@$(CC) $(CFLAGS) \
-				@RLS_CFLAGS@ \
-				-DBUILD_DATE=`date +"0x%Y%m%d"` \
-				-o $@ -c $<
+		@RLS_CFLAGS@ \
+		-DBUILD_DATE=`date +"0x%Y%m%d"` \
+		-o $@ -c $<
 
 $(OBJRLS)/%.o: \
 	%.cc \
@@ -116,9 +131,9 @@ $(OBJRLS)/%.o: \
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(CFLAGS) \
-				@RLS_CFLAGS@ \
-				-DBUILD_DATE=`date +"0x%Y%m%d"` \
-				-o $@ -c $<
+		@RLS_CFLAGS@ \
+		-DBUILD_DATE=`date +"0x%Y%m%d"` \
+		-o $@ -c $<
 
 $(POTDIR)/%.pot: %.c
 
diff --git a/src/plugins/hllapi/pluginmain.c b/src/plugins/hllapi/pluginmain.c
index c7d5242..1a8991d 100644
--- a/src/plugins/hllapi/pluginmain.c
+++ b/src/plugins/hllapi/pluginmain.c
@@ -40,7 +40,7 @@
 #endif // _WIN32
 
  #include <pw3270/plugin.h>
- #include <pw3270/v3270.h>
+ #include <v3270.h>
  #include <pw3270/ipcpackets.h>
  #include <lib3270/actions.h>
  #include <lib3270/charset.h>
@@ -205,10 +205,7 @@
  }
 
  static void get_host(pipe_source *source) {
-	char buffer[1024];
-	memset(buffer,0,sizeof(buffer));
-	lib3270_get_url(lib3270_get_default_session_handle(),buffer,sizeof(buffer));
-	send_text(source,buffer);
+	send_text(source,strdup(lib3270_get_url(lib3270_get_default_session_handle())));
  }
 
  static void process_input(pipe_source *source, DWORD cbRead)
@@ -220,7 +217,7 @@
 	switch(query->packet_id)
 	{
 	case HLLAPI_PACKET_CONNECT:
-		send_result(source,lib3270_connect(	lib3270_get_default_session_handle(),
+		send_result(source,lib3270_reconnect(	lib3270_get_default_session_handle(),
 											((struct hllapi_packet_connect *) source->buffer)->wait));
 		break;
 
@@ -229,8 +226,8 @@
 		break;
 
 	case HLLAPI_PACKET_SET_HOST:
-		send_result(source,lib3270_set_url( lib3270_get_default_session_handle(),
-											((struct hllapi_packet_text *) source->buffer)->text) != NULL);
+		send_result(source,lib3270_set_url(lib3270_get_default_session_handle(),
+											((struct hllapi_packet_text *) source->buffer)->text));
 		break;
 
 	case HLLAPI_PACKET_GET_HOST:
@@ -254,7 +251,7 @@
 		break;
 
 	case HLLAPI_PACKET_PRINT:
-		send_result(source,lib3270_print(lib3270_get_default_session_handle()));
+		send_result(source,lib3270_print_all(lib3270_get_default_session_handle()));
 		break;
 
 	case HLLAPI_PACKET_ERASE:
@@ -672,5 +669,5 @@
  G_GNUC_INTERNAL void set_active(gboolean on)
  {
  	trace("%s(%s)",__FUNCTION__,on ? "Active" : "Inactive");
-	v3270_set_script(v3270_get_default_widget(),'H',on);
+	// v3270_set_script(v3270_get_default_widget(),'H');
  }
--
libgit2 0.21.2