From 2bf659cfd0214a4fce9eb7ad942fed04cbc6f82f Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 15 Jan 2020 11:41:40 -0300
Subject: [PATCH] Fixing windows plugin.

---
 server/src/core/windows/gobject.c    | 13 +++++++++----
 server/src/core/windows/gobject.h    |  4 ++--
 server/src/core/windows/inout.c      |  1 +
 server/src/core/windows/pipesource.c |  1 +
 server/src/core/windows/response.c   |  1 +
 server/src/core/windows/start.c      |  1 +
 server/src/core/windows/stop.c       |  1 +
 7 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/server/src/core/windows/gobject.c b/server/src/core/windows/gobject.c
index 0745dcf..646aa2a 100644
--- a/server/src/core/windows/gobject.c
+++ b/server/src/core/windows/gobject.c
@@ -31,6 +31,7 @@
 #include <lib3270.h>
 #include <lib3270/actions.h>
 #include <lib3270/properties.h>
+#include <lib3270/log.h>
 #include <ipc-glib.h>
 #include <v3270.h>
 
@@ -53,8 +54,8 @@ static void ipc3270_finalize(GObject *object) {
 	if(ptr)
 		*ptr = 0;
 
-	v3270_set_session_name(ipc->terminal,widget_name);
 	lib3270_set_session_id(ipc->hSession, 0);
+	v3270_set_session_name(ipc->terminal,widget_name);
 
 	g_free(ipc->charset);
 
@@ -67,9 +68,13 @@ static void ipc3270_class_init(ipc3270Class *klass) {
 
 	debug("%s",__FUNCTION__);
 
-	GObjectClass *object_class;
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = ipc3270_finalize;
+	G_OBJECT_CLASS (klass)->finalize = ipc3270_finalize;
+
+	{
+		g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
+		g_autofree gchar * locdir = g_build_filename(appdir,"locale",NULL);
+		bindtextdomain(GETTEXT_PACKAGE,locdir);
+	}
 
 }
 
diff --git a/server/src/core/windows/gobject.h b/server/src/core/windows/gobject.h
index 17e8c0b..8df335f 100644
--- a/server/src/core/windows/gobject.h
+++ b/server/src/core/windows/gobject.h
@@ -37,14 +37,14 @@
 
 	#define WINDOWS_GOBJECT_H_INCLUDED
 
+	#include <winsock2.h>
 	#include <windows.h>
 	#include <config.h>
 
 	#define ENABLE_NLS
-	#define GETTEXT_PACKAGE PACKAGE_NAME
 
 	#include <libintl.h>
-	#include <glib/gi18n.h>
+	#include <glib/gi18n-lib.h>
 	#include <gio/gio.h>
 
 	#include <lib3270.h>
diff --git a/server/src/core/windows/inout.c b/server/src/core/windows/inout.c
index 34bfc25..4eb77be 100644
--- a/server/src/core/windows/inout.c
+++ b/server/src/core/windows/inout.c
@@ -36,6 +36,7 @@
 
  #include <config.h>
  #include <ipc-glib.h>
+ #include <lib3270/log.h>
  #include <string.h>
  #include <stdlib.h>
 
diff --git a/server/src/core/windows/pipesource.c b/server/src/core/windows/pipesource.c
index af3b393..92834a3 100644
--- a/server/src/core/windows/pipesource.c
+++ b/server/src/core/windows/pipesource.c
@@ -31,6 +31,7 @@
 #include <ipc-glib.h>
 #include <lib3270/trace.h>
 #include <lib3270/toggle.h>
+#include <lib3270/log.h>
 
 void ipc3270_wait_for_client(IPC3270_PIPE_SOURCE *source) {
 
diff --git a/server/src/core/windows/response.c b/server/src/core/windows/response.c
index 89216cf..a0b7150 100644
--- a/server/src/core/windows/response.c
+++ b/server/src/core/windows/response.c
@@ -37,6 +37,7 @@
 #include <lib3270/actions.h>
 #include <lib3270/properties.h>
 #include <lib3270/toggle.h>
+#include <lib3270/log.h>
 #include <v3270.h>
 
 /*--[ Widget definition ]----------------------------------------------------------------------------*/
diff --git a/server/src/core/windows/start.c b/server/src/core/windows/start.c
index a764ed0..33bbd3b 100644
--- a/server/src/core/windows/start.c
+++ b/server/src/core/windows/start.c
@@ -31,6 +31,7 @@
 #include <lib3270.h>
 #include <lib3270/actions.h>
 #include <lib3270/properties.h>
+#include <lib3270/log.h>
 #include <ipc-glib.h>
 
 void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUSED(**error)) {
diff --git a/server/src/core/windows/stop.c b/server/src/core/windows/stop.c
index 46bedfc..184208e 100644
--- a/server/src/core/windows/stop.c
+++ b/server/src/core/windows/stop.c
@@ -34,6 +34,7 @@
 
 #include "gobject.h"
 #include <lib3270.h>
+#include <lib3270/log.h>
 #include <ipc-glib.h>
 
 void ipc3270_release_object(ipc3270 *object) {
--
libgit2 0.21.2