Download as
Browse Code »

Commit 2bf659cfd0214a4fce9eb7ad942fed04cbc6f82f

Authored by Perry Werneck
1 parent 217a9ffb
Exists in master and in 1 other branch develop

Fixing windows plugin.

Showing 7 changed files with 16 additions and 6 deletions   Show diff stats
server/src/core/windows/gobject.c
  Diff comments   View file @2bf659c
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 #include <lib3270.h> 31 #include <lib3270.h>
32 #include <lib3270/actions.h> 32 #include <lib3270/actions.h>
33 #include <lib3270/properties.h> 33 #include <lib3270/properties.h>
  34 +#include <lib3270/log.h>
34 #include <ipc-glib.h> 35 #include <ipc-glib.h>
35 #include <v3270.h> 36 #include <v3270.h>
36 37
@@ -53,8 +54,8 @@ static void ipc3270_finalize(GObject *object) { @@ -53,8 +54,8 @@ static void ipc3270_finalize(GObject *object) {
53 if(ptr) 54 if(ptr)
54 *ptr = 0; 55 *ptr = 0;
55 56
56 - v3270_set_session_name(ipc->terminal,widget_name);  
57 lib3270_set_session_id(ipc->hSession, 0); 57 lib3270_set_session_id(ipc->hSession, 0);
  58 + v3270_set_session_name(ipc->terminal,widget_name);
58 59
59 g_free(ipc->charset); 60 g_free(ipc->charset);
60 61
@@ -67,9 +68,13 @@ static void ipc3270_class_init(ipc3270Class *klass) { @@ -67,9 +68,13 @@ static void ipc3270_class_init(ipc3270Class *klass) {
67 68
68 debug("%s",__FUNCTION__); 69 debug("%s",__FUNCTION__);
69 70
70 - GObjectClass *object_class;  
71 - object_class = G_OBJECT_CLASS (klass);  
72 - object_class->finalize = ipc3270_finalize; 71 + G_OBJECT_CLASS (klass)->finalize = ipc3270_finalize;
  72 +
  73 + {
  74 + g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
  75 + g_autofree gchar * locdir = g_build_filename(appdir,"locale",NULL);
  76 + bindtextdomain(GETTEXT_PACKAGE,locdir);
  77 + }
73 78
74 } 79 }
75 80
server/src/core/windows/gobject.h
  Diff comments   View file @2bf659c
@@ -37,14 +37,14 @@ @@ -37,14 +37,14 @@
37 37
38 #define WINDOWS_GOBJECT_H_INCLUDED 38 #define WINDOWS_GOBJECT_H_INCLUDED
39 39
  40 + #include <winsock2.h>
40 #include <windows.h> 41 #include <windows.h>
41 #include <config.h> 42 #include <config.h>
42 43
43 #define ENABLE_NLS 44 #define ENABLE_NLS
44 - #define GETTEXT_PACKAGE PACKAGE_NAME  
45 45
46 #include <libintl.h> 46 #include <libintl.h>
47 - #include <glib/gi18n.h> 47 + #include <glib/gi18n-lib.h>
48 #include <gio/gio.h> 48 #include <gio/gio.h>
49 49
50 #include <lib3270.h> 50 #include <lib3270.h>
server/src/core/windows/inout.c
  Diff comments   View file @2bf659c
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
36 36
37 #include <config.h> 37 #include <config.h>
38 #include <ipc-glib.h> 38 #include <ipc-glib.h>
  39 + #include <lib3270/log.h>
39 #include <string.h> 40 #include <string.h>
40 #include <stdlib.h> 41 #include <stdlib.h>
41 42
server/src/core/windows/pipesource.c
  Diff comments   View file @2bf659c
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 #include <ipc-glib.h> 31 #include <ipc-glib.h>
32 #include <lib3270/trace.h> 32 #include <lib3270/trace.h>
33 #include <lib3270/toggle.h> 33 #include <lib3270/toggle.h>
  34 +#include <lib3270/log.h>
34 35
35 void ipc3270_wait_for_client(IPC3270_PIPE_SOURCE *source) { 36 void ipc3270_wait_for_client(IPC3270_PIPE_SOURCE *source) {
36 37
server/src/core/windows/response.c
  Diff comments   View file @2bf659c
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 #include <lib3270/actions.h> 37 #include <lib3270/actions.h>
38 #include <lib3270/properties.h> 38 #include <lib3270/properties.h>
39 #include <lib3270/toggle.h> 39 #include <lib3270/toggle.h>
  40 +#include <lib3270/log.h>
40 #include <v3270.h> 41 #include <v3270.h>
41 42
42 /*--[ Widget definition ]----------------------------------------------------------------------------*/ 43 /*--[ Widget definition ]----------------------------------------------------------------------------*/
server/src/core/windows/start.c
  Diff comments   View file @2bf659c
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 #include <lib3270.h> 31 #include <lib3270.h>
32 #include <lib3270/actions.h> 32 #include <lib3270/actions.h>
33 #include <lib3270/properties.h> 33 #include <lib3270/properties.h>
  34 +#include <lib3270/log.h>
34 #include <ipc-glib.h> 35 #include <ipc-glib.h>
35 36
36 void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUSED(**error)) { 37 void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUSED(**error)) {
server/src/core/windows/stop.c
  Diff comments   View file @2bf659c
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
34 34
35 #include "gobject.h" 35 #include "gobject.h"
36 #include <lib3270.h> 36 #include <lib3270.h>
  37 +#include <lib3270/log.h>
37 #include <ipc-glib.h> 38 #include <ipc-glib.h>
38 39
39 void ipc3270_release_object(ipc3270 *object) { 40 void ipc3270_release_object(ipc3270 *object) {