Commit 2bf659cfd0214a4fce9eb7ad942fed04cbc6f82f
1 parent
217a9ffb
Exists in
master
and in
1 other branch
Fixing windows plugin.
Showing
7 changed files
with
16 additions
and
6 deletions
Show diff stats
server/src/core/windows/gobject.c
... | ... | @@ -31,6 +31,7 @@ |
31 | 31 | #include <lib3270.h> |
32 | 32 | #include <lib3270/actions.h> |
33 | 33 | #include <lib3270/properties.h> |
34 | +#include <lib3270/log.h> | |
34 | 35 | #include <ipc-glib.h> |
35 | 36 | #include <v3270.h> |
36 | 37 | |
... | ... | @@ -53,8 +54,8 @@ static void ipc3270_finalize(GObject *object) { |
53 | 54 | if(ptr) |
54 | 55 | *ptr = 0; |
55 | 56 | |
56 | - v3270_set_session_name(ipc->terminal,widget_name); | |
57 | 57 | lib3270_set_session_id(ipc->hSession, 0); |
58 | + v3270_set_session_name(ipc->terminal,widget_name); | |
58 | 59 | |
59 | 60 | g_free(ipc->charset); |
60 | 61 | |
... | ... | @@ -67,9 +68,13 @@ static void ipc3270_class_init(ipc3270Class *klass) { |
67 | 68 | |
68 | 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
... | ... | @@ -37,14 +37,14 @@ |
37 | 37 | |
38 | 38 | #define WINDOWS_GOBJECT_H_INCLUDED |
39 | 39 | |
40 | + #include <winsock2.h> | |
40 | 41 | #include <windows.h> |
41 | 42 | #include <config.h> |
42 | 43 | |
43 | 44 | #define ENABLE_NLS |
44 | - #define GETTEXT_PACKAGE PACKAGE_NAME | |
45 | 45 | |
46 | 46 | #include <libintl.h> |
47 | - #include <glib/gi18n.h> | |
47 | + #include <glib/gi18n-lib.h> | |
48 | 48 | #include <gio/gio.h> |
49 | 49 | |
50 | 50 | #include <lib3270.h> | ... | ... |
server/src/core/windows/inout.c
server/src/core/windows/pipesource.c
server/src/core/windows/response.c
... | ... | @@ -37,6 +37,7 @@ |
37 | 37 | #include <lib3270/actions.h> |
38 | 38 | #include <lib3270/properties.h> |
39 | 39 | #include <lib3270/toggle.h> |
40 | +#include <lib3270/log.h> | |
40 | 41 | #include <v3270.h> |
41 | 42 | |
42 | 43 | /*--[ Widget definition ]----------------------------------------------------------------------------*/ | ... | ... |
server/src/core/windows/start.c