diff --git a/configure.ac b/configure.ac
index e499770..3f325d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ else
 fi
 
 case "$host" in
-	*-mingw32)
+	*-mingw32|*-pc-msys)
 
 		EXEEXT=".exe"
 		DLLPREFIX=""
@@ -106,6 +106,8 @@ case "$host" in
 		STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static"
 		DLL_LDFLAGS="-shared -Wl,--add-stdcall-alias"
 
+		AC_DEFINE(ENABLE_WINDOWS_REGISTRY)
+
 		AC_CONFIG_FILES(win/makeruntime.sh)
 		AC_CONFIG_FILES(win/copydeps.sh)
 		AC_CONFIG_FILES(win/$PACKAGE_TARNAME.nsi)
@@ -239,7 +241,7 @@ AC_CHECK_HEADER(libintl.h, [
 	AC_DEFINE(HAVE_LIBINTL, 1)
 
 	case "$host" in
-	*-mingw32)
+	*-mingw32|*-pc-msys)
 		INTL_LIBS="-lintl"
 		;;
 
@@ -376,7 +378,7 @@ AC_ARG_ENABLE([pic],
 	esac
 
 dnl	case "$host" in
-dnl		*-mingw32)
+dnl		*-mingw32|*-pc-msys)
 dnl			app_cv_pic="no"
 dnl			;;
 dnl
@@ -449,7 +451,7 @@ AC_ARG_WITH([inet-ntop], [AS_HELP_STRING([--with-inet-ntop], [Assume that inet_n
 if test "$app_cv_inet_ntop" == "auto"; then
 
 	case "$host" in
-	*-mingw32)
+	*-mingw32|*-pc-msys)
 		app_cv_inet_ntop="yes"
 		;;
 
diff --git a/src/include/config.h.in b/src/include/config.h.in
index c99be6e..9e9bda0 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -53,8 +53,8 @@
 	#undef SSL_ENABLE_CRL_CHECK
 
 #ifdef WIN32
-	#undef HAVE_WIN_REGISTRY
-#endif // HAVE_WIN_REGISTRY
+	#undef ENABLE_WINDOWS_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 	#undef HAVE_GNOME
 
diff --git a/src/pw3270/common/common.h b/src/pw3270/common/common.h
index e998b3f..d9245f1 100644
--- a/src/pw3270/common/common.h
+++ b/src/pw3270/common/common.h
@@ -87,14 +87,14 @@
 
  void		  restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
 
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
  gboolean	  get_registry_handle(const gchar *group, HKEY *hKey, REGSAM samDesired);
  void		  registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data);
  void 		  registry_set_double(HKEY hKey, const gchar *key, gdouble value);
  gboolean	  registry_get_double(HKEY hKey, const gchar *key, gdouble *value);
 #else
  GKeyFile	* get_application_keyfile(void);
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 
 #endif
diff --git a/src/pw3270/common/config.c b/src/pw3270/common/config.c
index 31152e4..c0e53af 100644
--- a/src/pw3270/common/config.c
+++ b/src/pw3270/common/config.c
@@ -43,7 +43,6 @@
 #ifdef WIN32
 
 	#include <windows.h>
-	// #define HAVE_WIN_REGISTRY 1
 
 	#ifndef KEY_WOW64_64KEY
 		#define KEY_WOW64_64KEY 0x0100
@@ -57,7 +56,7 @@
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
 
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
  	static const gchar	* registry_path = "SOFTWARE";
 
@@ -65,11 +64,11 @@
 
 	static GKeyFile		* program_config = NULL;
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
  enum REG_KEY
  {
@@ -270,11 +269,11 @@
  	return g_build_filename(g_get_user_config_dir(),name,NULL);
 
  }
-#endif  //  #ifdef HAVE_WIN_REGISTRY
+#endif  //  #ifdef ENABLE_WINDOWS_REGISTRY
 
  gboolean get_boolean_from_config(const gchar *group, const gchar *key, gboolean def)
  {
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 	gboolean	ret 		= def;
 	HKEY 		hKey;
 
@@ -308,14 +307,14 @@
 		else
 			return val;
 	}
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 	return def;
  }
 
  gint get_integer_from_config(const gchar *group, const gchar *key, gint def)
  {
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
 	HKEY key_handle;
 
@@ -351,7 +350,7 @@
 		else
 			return val;
 	}
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 	return def;
  }
@@ -359,7 +358,7 @@
 
  gchar * get_string_from_config(const gchar *group, const gchar *key, const gchar *def)
  {
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
 	HKEY key_handle;
 	unsigned long	  datalen 	= 4096;
@@ -406,12 +405,12 @@
 
 	return NULL;
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
  }
 
 void configuration_init(void)
 {
-#ifndef HAVE_WIN_REGISTRY
+#ifndef ENABLE_WINDOWS_REGISTRY
 	gchar *filename = search_for_ini();
 
 	if(program_config)
@@ -426,14 +425,14 @@ void configuration_init(void)
 		g_free(filename);
 	}
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 }
 
 static void set_string(const gchar *group, const gchar *key, const gchar *fmt, va_list args)
 {
 	gchar * value = g_strdup_vprintf(fmt,args);
 
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
 	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
  	HKEY	hKey;
@@ -466,7 +465,7 @@ void set_string_to_config(const gchar *group, const gchar *key, const gchar *fmt
 
 void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
 {
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
  	HKEY	hKey;
  	DWORD	disp;
@@ -502,13 +501,13 @@ void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
 	if(program_config)
 		g_key_file_set_boolean(program_config,group,key,val);
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 }
 
 void set_integer_to_config(const gchar *group, const gchar *key, gint val)
 {
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
  	HKEY	hKey;
  	DWORD	disp;
@@ -544,13 +543,13 @@ void set_integer_to_config(const gchar *group, const gchar *key, gint val)
 	if(program_config)
 		g_key_file_set_integer(program_config,group,key,val);
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 }
 
 void configuration_deinit(void)
 {
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
 #else
 
@@ -576,7 +575,7 @@ void configuration_deinit(void)
 	g_key_file_free(program_config);
 	program_config = NULL;
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 }
 
 gchar * build_data_filename(const gchar *first_element, ...)
@@ -606,7 +605,7 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 
 	g_autofree gchar * suffix = g_string_free(result, FALSE);
 
-#if defined( HAVE_WIN_REGISTRY )
+#if defined( ENABLE_WINDOWS_REGISTRY )
 	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
 	{
 		g_autofree gchar * path	= g_strconcat("Software\\",appname[p],NULL);
@@ -639,7 +638,7 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 		}
 
 	}
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 #ifdef _WIN32
 	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
@@ -680,7 +679,7 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 	return g_build_filename(".",suffix,NULL);
 }
 
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 gboolean get_registry_handle(const gchar *group, HKEY *hKey, REGSAM samDesired)
 {
 	gboolean	  ret;
@@ -703,7 +702,7 @@ GKeyFile * get_application_keyfile(void)
 		configuration_init();
 	return program_config;
 }
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
  static const struct _WindowState
  {
@@ -719,7 +718,7 @@ GKeyFile * get_application_keyfile(void)
 
 void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState)
 {
-#if defined( HAVE_WIN_REGISTRY )
+#if defined( ENABLE_WINDOWS_REGISTRY )
 
         gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
 
@@ -751,12 +750,12 @@ void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindow
 
 		g_free(id);
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 }
 
 void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
 {
-#if defined( HAVE_WIN_REGISTRY )
+#if defined( ENABLE_WINDOWS_REGISTRY )
 
         gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
 
@@ -786,10 +785,10 @@ void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget 
 
 		g_free(id);
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 }
 
-#if defined( HAVE_WIN_REGISTRY )
+#if defined( ENABLE_WINDOWS_REGISTRY )
 static void restore_window_from_regkey(GtkWidget *hwnd, HKEY hKey, const gchar *path)
 {
 	int 			f;
@@ -835,11 +834,11 @@ static void restore_window_from_regkey(GtkWidget *hwnd, HKEY hKey, const gchar *
 
 
 }
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
 {
-#if defined( HAVE_WIN_REGISTRY )
+#if defined( ENABLE_WINDOWS_REGISTRY )
 
 	gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
 	HKEY    hKey;
@@ -885,7 +884,7 @@ void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget 
 
 	g_free(id);
 
-#endif // HAVE_WIN_REGISTRY
+#endif // ENABLE_WINDOWS_REGISTRY
 
 }
 
diff --git a/src/pw3270/print.c b/src/pw3270/print.c
index 9f870e2..e7117eb 100644
--- a/src/pw3270/print.c
+++ b/src/pw3270/print.c
@@ -272,7 +272,7 @@ static gchar * enum_to_string(GType type, guint enum_value)
 
 		trace("Saving settings PrintSettings=%p page_setup=%p",settings,pgsetup);
 
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 		HKEY registry;
 
 		if(get_registry_handle("print",&registry,KEY_SET_VALUE))
@@ -625,7 +625,7 @@ static gchar * enum_to_string(GType type, guint enum_value)
 
 	// Load page and print settings
 	{
-#ifdef HAVE_WIN_REGISTRY
+#ifdef ENABLE_WINDOWS_REGISTRY
 
 		HKEY registry;
 
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 86f89fd..aa6b0c6 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -95,6 +95,8 @@
 														NULL
 														};
 
+static GtkWidget * trace_window = NULL;
+
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -157,65 +159,7 @@
 
  }
 
- /*
- static void g_trace(H3270 *hSession, const char *fmt, va_list args)
- {
-	gchar *ptr = g_strdup_vprintf(fmt,args);
-
-    if(tracefile)
-	{
-		// Has trace file, use it
-		int err;
-
-		FILE *out = fopen(tracefile,"a");
-		err = errno;
-
-		if(!out)
-		{
-			// Error opening trace file, notify user and disable it
-			GtkWidget *popup = gtk_message_dialog_new_with_markup(
-												GTK_WINDOW(pw3270_get_toplevel()),
-												GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-												GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE,
-												_( "Can't save trace data to file %s" ),tracefile);
-
-			gtk_window_set_title(GTK_WINDOW(popup),_("Can't open file"));
-
-			gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",strerror(err));
-
-			gtk_dialog_run(GTK_DIALOG(popup));
-			gtk_widget_destroy(popup);
-
-			tracefile = NULL;
-		}
-		else
-		{
-			fprintf(out,"%s",ptr);
-			fclose(out);
-		}
-	}
-	else
-	{
-		// No trace file, open standard window
-		gchar * utftext = g_convert_with_fallback(ptr,-1,"UTF-8",lib3270_get_display_charset(hSession),"?",NULL,NULL,NULL);
-
-		if(!trace_window)
-		{
-			trace_window = v3270_trace_new_from_session(hSession);
-			v3270_trace_set_destroy_on_close(trace_window,TRUE);
-			g_signal_connect(trace_window, "destroy", G_CALLBACK(trace_window_destroy), hSession);
-			gtk_window_set_default_size(GTK_WINDOW(trace_window),590,430);
-			gtk_widget_show(trace_window);
-		}
-		v3270_trace_printf(trace_window,"%s",utftext);
-		g_free(utftext);
-	}
-
-	g_free(ptr);
- }
- */
-
- static void trace_file(G_GNUC_UNUSED H3270 *hSession, void * userdata, const char *fmt, va_list args)
+ static void trace_on_file(G_GNUC_UNUSED H3270 *hSession, void * userdata, const char *fmt, va_list args)
  {
 	int err;
 
@@ -255,6 +199,9 @@
 	lib3270_set_toggle(hSession,LIB3270_TOGGLE_SCREEN_TRACE,0);
 	lib3270_set_toggle(hSession,LIB3270_TOGGLE_EVENT_TRACE,0);
 	lib3270_set_toggle(hSession,LIB3270_TOGGLE_NETWORK_TRACE,0);
+
+	trace_window = NULL;
+
  }
 
  struct trace_data
@@ -265,20 +212,21 @@
 
  static gboolean bg_trace_window(struct trace_data *data)
  {
-	GtkWidget * widget = v3270_trace_new_from_session(data->hSession,data->text);
+ 	if(!trace_window)
+		trace_window = v3270_trace_new_from_session(data->hSession,data->text);
 
-	v3270_trace_set_destroy_on_close(widget,TRUE);
+	v3270_trace_set_destroy_on_close(trace_window,TRUE);
 
-	g_signal_connect(widget, "destroy", G_CALLBACK(trace_window_destroy), data->hSession);
+	g_signal_connect(trace_window, "destroy", G_CALLBACK(trace_window_destroy), data->hSession);
 
-	gtk_widget_show_all(widget);
+	gtk_widget_show_all(trace_window);
 
 	g_free(data->text);
 
 	return FALSE;
  }
 
- static void trace_window(G_GNUC_UNUSED H3270 *hSession, G_GNUC_UNUSED void * userdata, const char *fmt, va_list args)
+ static void trace_on_window(G_GNUC_UNUSED H3270 *hSession, G_GNUC_UNUSED void * userdata, const char *fmt, va_list args)
  {
 	struct trace_data * data = g_new0(struct trace_data,1);
 
@@ -296,11 +244,11 @@
 
 	if(tracefile)
 	{
-		lib3270_set_trace_handler(pw3270_get_session(widget),trace_file,(void *) widget);
+		lib3270_set_trace_handler(pw3270_get_session(widget),trace_on_file,(void *) widget);
 	}
 	else
 	{
-		lib3270_set_trace_handler(pw3270_get_session(widget),trace_window,(void *) widget);
+		lib3270_set_trace_handler(pw3270_get_session(widget),trace_on_window,(void *) widget);
 	}
 
 	if(host)
--
libgit2 0.21.2