Download as
Browse Code »

Commit 2b7e746fbe813539ed88a3d0f2beae3dfa5b0bd3

Authored by Perry Werneck
1 parent 2d20fb5e
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Reenabling HLLAPI plugin.

Showing 13 changed files with 149 additions and 170 deletions   Show diff stats
@@ -71,6 +71,7 @@ HELP2MAN=@HELP2MAN@ @@ -71,6 +71,7 @@ HELP2MAN=@HELP2MAN@
71 all: \ 71 all: \
72 $(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ 72 $(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
73 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ 73 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
  74 + $(BINRLS)/libpw3270cpp.a \
74 $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \ 75 $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \
75 locale/$(PACKAGE_TARNAME).pot 76 locale/$(PACKAGE_TARNAME).pot
76 77
@@ -82,26 +83,12 @@ application: \ @@ -82,26 +83,12 @@ application: \
82 $(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ 83 $(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
83 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ 84 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
84 85
  86 +$(BINRLS)/libpw3270cpp.a: \
  87 + src/libpw3270cpp/*
85 88
86 -#---[ Debug Rules ]---------------------------------------------------------------------- 89 + @$(MAKE) -C src/libpw3270cpp Release
87 90
88 -#$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \  
89 -# modules/lib3270/* \  
90 -# modules/lib3270/src/lib3270/* \  
91 -# modules/lib3270/src/include/* \  
92 -# modules/lib3270/src/include/lib3270/*  
93 -#  
94 -# @$(MKDIR) `dirname $@`  
95 -# @$(MAKE) -C modules/lib3270 $@  
96 -  
97 -#$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \  
98 -# modules/libv3270/* \  
99 -# modules/libv3270/src/v3270/* \  
100 -# modules/libv3270/src/include/* \  
101 -# modules/libv3270/src/include/v3270/* \  
102 -#  
103 -# @$(MKDIR) `dirname $@`  
104 -# @$(MAKE) -C modules/libv3270 $@ 91 +#---[ Debug Rules ]----------------------------------------------------------------------
105 92
106 $(BINDBG)/%@EXEEXT@: \ 93 $(BINDBG)/%@EXEEXT@: \
107 $(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ 94 $(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
@@ -112,30 +99,13 @@ $(BINDBG)/%@EXEEXT@: \ @@ -112,30 +99,13 @@ $(BINDBG)/%@EXEEXT@: \
112 99
113 $(BINDBG)/plugins/%@DLLEXT@: \ 100 $(BINDBG)/plugins/%@DLLEXT@: \
114 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \ 101 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
  102 + $(BINDBG)/libpw3270cpp.a \
115 src/plugins/%/* 103 src/plugins/%/*
116 104
117 @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@ 105 @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
118 106
119 #---[ Release Rules ]-------------------------------------------------------------------- 107 #---[ Release Rules ]--------------------------------------------------------------------
120 108
121 -#$(BINRLS)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \  
122 -# modules/lib3270/* \  
123 -# modules/lib3270/src/lib3270/* \  
124 -# modules/lib3270/src/include/* \  
125 -# modules/lib3270/src/include/lib3270/*  
126 -#  
127 -# @$(MKDIR) `dirname $@`  
128 -# @$(MAKE) -C modules/lib3270 $@  
129 -  
130 -#$(BINRLS)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \  
131 -# modules/libv3270/* \  
132 -# modules/libv3270/src/v3270/* \  
133 -# modules/libv3270/src/include/* \  
134 -# modules/libv3270/src/include/v3270/* \  
135 -#  
136 -# @$(MKDIR) `dirname $@`  
137 -# @$(MAKE) -C modules/libv3270 $@  
138 -  
139 $(BINRLS)/%@EXEEXT@: \ 109 $(BINRLS)/%@EXEEXT@: \
140 $(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ 110 $(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
141 src/% \ 111 src/% \
@@ -145,6 +115,7 @@ $(BINRLS)/%@EXEEXT@: \ @@ -145,6 +115,7 @@ $(BINRLS)/%@EXEEXT@: \
145 115
146 $(BINRLS)/plugins/%@DLLEXT@: \ 116 $(BINRLS)/plugins/%@DLLEXT@: \
147 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ 117 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
  118 + $(BINRLS)/libpw3270cpp.a \
148 src/plugins/%/* 119 src/plugins/%/*
149 120
150 @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@ 121 @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
@@ -163,11 +134,6 @@ publish-release: \ @@ -163,11 +134,6 @@ publish-release: \
163 ~/public_html/release-$(PACKAGE_TARNAME)-@host_cpu@.zip \ 134 ~/public_html/release-$(PACKAGE_TARNAME)-@host_cpu@.zip \
164 $(BINRLS)/* 135 $(BINRLS)/*
165 136
166 -run: \  
167 - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@  
168 -  
169 - @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@  
170 -  
171 #---[ Install Rules ]-------------------------------------------------------------------- 137 #---[ Install Rules ]--------------------------------------------------------------------
172 138
173 install: \ 139 install: \
@@ -274,6 +240,11 @@ publish-debug: \ @@ -274,6 +240,11 @@ publish-debug: \
274 ~/public_html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip \ 240 ~/public_html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip \
275 $(BINDBG)/* 241 $(BINDBG)/*
276 242
  243 +$(BINDBG)/libpw3270cpp.a: \
  244 + src/libpw3270cpp/*
  245 +
  246 + @$(MAKE) -C src/libpw3270cpp Debug
  247 +
277 run: \ 248 run: \
278 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ 249 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
279 250
@@ -113,7 +113,7 @@ case "$host" in @@ -113,7 +113,7 @@ case "$host" in
113 AC_CONFIG_FILES(win/$PACKAGE_TARNAME.nsi) 113 AC_CONFIG_FILES(win/$PACKAGE_TARNAME.nsi)
114 AC_CONFIG_FILES(src/pw3270/resources.rc) 114 AC_CONFIG_FILES(src/pw3270/resources.rc)
115 115
116 -dnl PLUGINS="$PLUGINS hllapi" 116 + PLUGINS="$PLUGINS hllapi"
117 117
118 if test "$host_cpu" = "x86_64"; then 118 if test "$host_cpu" = "x86_64"; then
119 app_cv_programfiles="PROGRAMFILES64" 119 app_cv_programfiles="PROGRAMFILES64"
@@ -519,6 +519,7 @@ dnl --------------------------------------------------------------------------- @@ -519,6 +519,7 @@ dnl ---------------------------------------------------------------------------
519 AC_CONFIG_FILES(src/pw3270/Makefile) 519 AC_CONFIG_FILES(src/pw3270/Makefile)
520 AC_CONFIG_FILES(src/pw3270/uiparser/Makefile) 520 AC_CONFIG_FILES(src/pw3270/uiparser/Makefile)
521 AC_CONFIG_FILES(src/pw3270/common/Makefile) 521 AC_CONFIG_FILES(src/pw3270/common/Makefile)
  522 +
522 AC_CONFIG_FILES(src/libpw3270cpp/Makefile) 523 AC_CONFIG_FILES(src/libpw3270cpp/Makefile)
523 524
524 AC_CONFIG_FILES(ui/Makefile) 525 AC_CONFIG_FILES(ui/Makefile)
locale/pw3270.pot
  Diff comments   View file @2b7e746
@@ -3,16 +3,13 @@ @@ -3,16 +3,13 @@
3 # This file is distributed under the same license as the PACKAGE package. 3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5 # 5 #
6 -#: properties.c:69 properties.c:76 properties.c:83 properties.c:104  
7 -#: properties.c:111 properties.c:118 properties.c:125 properties.c:139  
8 -#: properties.c:146  
9 #, fuzzy 6 #, fuzzy
10 msgid "" 7 msgid ""
11 msgstr "" 8 msgstr ""
12 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
13 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
14 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
15 -"POT-Creation-Date: 2019-01-30 14:50-0200\n" 12 +"POT-Creation-Date: 2019-02-01 14:52-0200\n"
16 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
17 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
18 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +20,7 @@ msgstr &quot;&quot; @@ -23,7 +20,7 @@ msgstr &quot;&quot;
23 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
24 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
25 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
26 -"POT-Creation-Date: 2019-01-30 15:56+0000\n" 23 +"POT-Creation-Date: 2019-02-01 13:26+0000\n"
27 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
28 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
29 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,7 +31,7 @@ msgstr &quot;&quot; @@ -34,7 +31,7 @@ msgstr &quot;&quot;
34 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
35 "Project-Id-Version: PACKAGE VERSION\n" 32 "Project-Id-Version: PACKAGE VERSION\n"
36 "Report-Msgid-Bugs-To: \n" 33 "Report-Msgid-Bugs-To: \n"
37 -"POT-Creation-Date: 2019-01-30 15:58+0000\n" 34 +"POT-Creation-Date: 2019-02-01 13:29+0000\n"
38 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
39 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
40 "Language-Team: LANGUAGE <LL@li.org>\n" 37 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,25 +50,14 @@ msgstr &quot;&quot; @@ -53,25 +50,14 @@ msgstr &quot;&quot;
53 "MIME-Version: 1.0\n" 50 "MIME-Version: 1.0\n"
54 "Content-Type: text/plain; charset=CHARSET\n" 51 "Content-Type: text/plain; charset=CHARSET\n"
55 "Content-Transfer-Encoding: 8bit\n" 52 "Content-Transfer-Encoding: 8bit\n"
56 -"#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n"  
57 -"Project-Id-Version: PACKAGE VERSION\n"  
58 -"Report-Msgid-Bugs-To: \n"  
59 -"POT-Creation-Date: 2019-01-30 14:50-0200\n"  
60 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"  
61 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"  
62 -"Language-Team: LANGUAGE <LL@li.org>\n"  
63 -"Language: \n"  
64 -"MIME-Version: 1.0\n"  
65 -"Content-Type: text/plain; charset=CHARSET\n"  
66 -"Content-Transfer-Encoding: 8bit\n"  
67 53
68 #: window.c:399 54 #: window.c:399
69 #, c-format 55 #, c-format
70 msgid " and <b>%s</b> for %s." 56 msgid " and <b>%s</b> for %s."
71 msgstr "" 57 msgstr ""
72 58
73 -#: telnet.c:688 iocalls.c:563 iocalls.c:580 linux/connect.c:83  
74 -#: linux/connect.c:99 59 +#: telnet.c:688 iocalls.c:563 iocalls.c:580 linux/connect.c:81
  60 +#: linux/connect.c:97
75 #, c-format 61 #, c-format
76 msgid "%s" 62 msgid "%s"
77 msgstr "" 63 msgstr ""
@@ -101,7 +87,7 @@ msgstr &quot;&quot; @@ -101,7 +87,7 @@ msgstr &quot;&quot;
101 msgid "%s action needs src attribute" 87 msgid "%s action needs src attribute"
102 msgstr "" 88 msgstr ""
103 89
104 -#: main.c:93 90 +#: main.c:97
105 #, c-format 91 #, c-format
106 msgid "%s requires GTK version %d.%d.%d" 92 msgid "%s requires GTK version %d.%d.%d"
107 msgstr "" 93 msgstr ""
@@ -141,7 +127,7 @@ msgstr &quot;&quot; @@ -141,7 +127,7 @@ msgstr &quot;&quot;
141 msgid "%s<b>%s</b> for %s" 127 msgid "%s<b>%s</b> for %s"
142 msgstr "" 128 msgstr ""
143 129
144 -#: main.c:324 130 +#: main.c:380
145 msgid "- 3270 Emulator for Gtk" 131 msgid "- 3270 Emulator for Gtk"
146 msgstr "" 132 msgstr ""
147 133
@@ -149,7 +135,7 @@ msgstr &quot;&quot; @@ -149,7 +135,7 @@ msgstr &quot;&quot;
149 msgid "16 colors" 135 msgid "16 colors"
150 msgstr "" 136 msgstr ""
151 137
152 -#: screen.c:766 screen.c:803 screen.c:821 screen.c:946 138 +#: screen.c:782 screen.c:819 screen.c:837 screen.c:962
153 msgid "3270 Error" 139 msgid "3270 Error"
154 msgstr "" 140 msgstr ""
155 141
@@ -157,7 +143,7 @@ msgstr &quot;&quot; @@ -157,7 +143,7 @@ msgstr &quot;&quot;
157 msgid "3270 File transfer" 143 msgid "3270 File transfer"
158 msgstr "" 144 msgstr ""
159 145
160 -#: screen.c:784 146 +#: screen.c:800
161 msgid "3270 Warning" 147 msgid "3270 Warning"
162 msgstr "" 148 msgstr ""
163 149
@@ -223,7 +209,7 @@ msgstr &quot;&quot; @@ -223,7 +209,7 @@ msgstr &quot;&quot;
223 msgid "<b>SSL state is undefined</b>Unexpected SSL status %ld" 209 msgid "<b>SSL state is undefined</b>Unexpected SSL status %ld"
224 msgstr "" 210 msgstr ""
225 211
226 -#: main.c:344 212 +#: main.c:400
227 msgid "" 213 msgid ""
228 "<b>Valid options:</b>\n" 214 "<b>Valid options:</b>\n"
229 "\n" 215 "\n"
@@ -259,7 +245,7 @@ msgstr &quot;&quot; @@ -259,7 +245,7 @@ msgstr &quot;&quot;
259 msgid "Aborting..." 245 msgid "Aborting..."
260 msgstr "" 246 msgstr ""
261 247
262 -#: src/dialogs/security.c:189 248 +#: src/dialogs/security.c:194
263 msgid "About security" 249 msgid "About security"
264 msgstr "" 250 msgstr ""
265 251
@@ -309,6 +295,10 @@ msgstr &quot;&quot; @@ -309,6 +295,10 @@ msgstr &quot;&quot;
309 msgid "Appends the source file to the destination file." 295 msgid "Appends the source file to the destination file."
310 msgstr "" 296 msgstr ""
311 297
  298 +#: main.c:369
  299 +msgid "Application name"
  300 +msgstr ""
  301 +
312 #: 10keypad.xml:85 302 #: 10keypad.xml:85
313 msgid "Attn" 303 msgid "Attn"
314 msgstr "" 304 msgstr ""
@@ -421,7 +411,7 @@ msgstr &quot;&quot; @@ -421,7 +411,7 @@ msgstr &quot;&quot;
421 msgid "C_onnect" 411 msgid "C_onnect"
422 msgstr "" 412 msgstr ""
423 413
424 -#: toggles.c:333 linux/connect.c:278 414 +#: toggles.c:333 linux/connect.c:229
425 #, c-format 415 #, c-format
426 msgid "Can't %s network keep-alive" 416 msgid "Can't %s network keep-alive"
427 msgstr "" 417 msgstr ""
@@ -435,20 +425,16 @@ msgstr &quot;&quot; @@ -435,20 +425,16 @@ msgstr &quot;&quot;
435 msgid "Can't bind to LDAP server" 425 msgid "Can't bind to LDAP server"
436 msgstr "" 426 msgstr ""
437 427
438 -#: linux/connect.c:91 428 +#: linux/connect.c:89
439 #, c-format 429 #, c-format
440 msgid "Can't connect to %s" 430 msgid "Can't connect to %s"
441 msgstr "" 431 msgstr ""
442 432
443 -#: linux/connect.c:225 433 +#: linux/connect.c:179
444 #, c-format 434 #, c-format
445 msgid "Can't connect to %s:%s" 435 msgid "Can't connect to %s:%s"
446 msgstr "" 436 msgstr ""
447 437
448 -#: main.c:72  
449 -msgid "Can't connect to DBUS server"  
450 -msgstr ""  
451 -  
452 #: src/v3270/selection.c:463 438 #: src/v3270/selection.c:463
453 #, c-format 439 #, c-format
454 msgid "Can't convert line %lu from %s to %s" 440 msgid "Can't convert line %lu from %s to %s"
@@ -462,10 +448,6 @@ msgstr &quot;&quot; @@ -462,10 +448,6 @@ msgstr &quot;&quot;
462 msgid "Can't get CRL from LDAP Search" 448 msgid "Can't get CRL from LDAP Search"
463 msgstr "" 449 msgstr ""
464 450
465 -#: main.c:117  
466 -msgid "Can't get DBUS object name"  
467 -msgstr ""  
468 -  
469 #: ssl/linux/getcrl.c:357 ssl/linux/getcrl.c:368 451 #: ssl/linux/getcrl.c:357 ssl/linux/getcrl.c:368
470 msgid "Can't get LDAP attribute" 452 msgid "Can't get LDAP attribute"
471 msgstr "" 453 msgstr ""
@@ -713,15 +695,11 @@ msgstr &quot;&quot; @@ -713,15 +695,11 @@ msgstr &quot;&quot;
713 msgid "Connect on startup" 695 msgid "Connect on startup"
714 msgstr "" 696 msgstr ""
715 697
716 -#: gobject.c:201  
717 -msgid "Connecting to host"  
718 -msgstr ""  
719 -  
720 -#: iocalls.c:547 linux/connect.c:229 linux/connect.c:264 linux/connect.c:282 698 +#: iocalls.c:547 linux/connect.c:183 linux/connect.c:215 linux/connect.c:233
721 msgid "Connection error" 699 msgid "Connection error"
722 msgstr "" 700 msgstr ""
723 701
724 -#: linux/connect.c:97 702 +#: linux/connect.c:95
725 msgid "Connection failed" 703 msgid "Connection failed"
726 msgstr "" 704 msgstr ""
727 705
@@ -1009,7 +987,7 @@ msgstr &quot;&quot; @@ -1009,7 +987,7 @@ msgstr &quot;&quot;
1009 msgid "Function bar" 987 msgid "Function bar"
1010 msgstr "" 988 msgstr ""
1011 989
1012 -#: main.c:97 main.c:394 990 +#: main.c:101 main.c:476
1013 msgid "GTK Version mismatch" 991 msgid "GTK Version mismatch"
1014 msgstr "" 992 msgstr ""
1015 993
@@ -1061,11 +1039,11 @@ msgstr &quot;&quot; @@ -1061,11 +1039,11 @@ msgstr &quot;&quot;
1061 msgid "Host rejected resource(s)" 1039 msgid "Host rejected resource(s)"
1062 msgstr "" 1040 msgstr ""
1063 1041
1064 -#: main.c:306 1042 +#: main.c:360
1065 msgid "Host system type" 1043 msgid "Host system type"
1066 msgstr "" 1044 msgstr ""
1067 1045
1068 -#: main.c:304 1046 +#: main.c:358
1069 msgid "Host to connect" 1047 msgid "Host to connect"
1070 msgstr "" 1048 msgstr ""
1071 1049
@@ -1181,18 +1159,30 @@ msgstr &quot;&quot; @@ -1181,18 +1159,30 @@ msgstr &quot;&quot;
1181 msgid "Invalid session handler" 1159 msgid "Invalid session handler"
1182 msgstr "" 1160 msgstr ""
1183 1161
1184 -#: src/dialogs/security.c:170 1162 +#: src/dialogs/security.c:175
1185 msgid "Invalid state" 1163 msgid "Invalid state"
1186 msgstr "" 1164 msgstr ""
1187 1165
  1166 +#: properties.c:83
  1167 +msgid "Is connection secure"
  1168 +msgstr ""
  1169 +
1188 #: properties.c:167 1170 #: properties.c:167
1189 msgid "Is starting (no first screen)?" 1171 msgid "Is starting (no first screen)?"
1190 msgstr "" 1172 msgstr ""
1191 1173
  1174 +#: properties.c:76
  1175 +msgid "Is terminal connected"
  1176 +msgstr ""
  1177 +
1192 #: properties.c:153 1178 #: properties.c:153
1193 msgid "Is terminal in the INITIAL_E state?" 1179 msgid "Is terminal in the INITIAL_E state?"
1194 msgstr "" 1180 msgstr ""
1195 1181
  1182 +#: properties.c:69
  1183 +msgid "Is terminal ready"
  1184 +msgstr ""
  1185 +
1196 #: 80javasamples.xml:38 1186 #: 80javasamples.xml:38
1197 msgid "Java" 1187 msgid "Java"
1198 msgstr "" 1188 msgstr ""
@@ -1225,7 +1215,7 @@ msgstr &quot;&quot; @@ -1225,7 +1215,7 @@ msgstr &quot;&quot;
1225 msgid "Load queue from file" 1215 msgid "Load queue from file"
1226 msgstr "" 1216 msgstr ""
1227 1217
1228 -#: config.c:423 1218 +#: config.c:430
1229 #, c-format 1219 #, c-format
1230 msgid "Loading %s" 1220 msgid "Loading %s"
1231 msgstr "" 1221 msgstr ""
@@ -1234,11 +1224,11 @@ msgstr &quot;&quot; @@ -1234,11 +1224,11 @@ msgstr &quot;&quot;
1234 msgid "Local:" 1224 msgid "Local:"
1235 msgstr "" 1225 msgstr ""
1236 1226
1237 -#: main.c:319 1227 +#: main.c:375
1238 msgid "Log to file" 1228 msgid "Log to file"
1239 msgstr "" 1229 msgstr ""
1240 1230
1241 -#: main.c:312 1231 +#: main.c:366
1242 msgid "Minutes for auto-disconnect" 1232 msgid "Minutes for auto-disconnect"
1243 msgstr "" 1233 msgstr ""
1244 1234
@@ -1271,7 +1261,7 @@ msgstr &quot;&quot; @@ -1271,7 +1261,7 @@ msgstr &quot;&quot;
1271 msgid "Mustard" 1261 msgid "Mustard"
1272 msgstr "" 1262 msgstr ""
1273 1263
1274 -#: telnet.c:354 linux/event_dispatcher.c:144 linux/connect.c:81 1264 +#: telnet.c:354 linux/event_dispatcher.c:144 linux/connect.c:79
1275 msgid "Network error" 1265 msgid "Network error"
1276 msgstr "" 1266 msgstr ""
1277 1267
@@ -1493,7 +1483,7 @@ msgstr &quot;&quot; @@ -1493,7 +1483,7 @@ msgstr &quot;&quot;
1493 msgid "PF9" 1483 msgid "PF9"
1494 msgstr "" 1484 msgstr ""
1495 1485
1496 -#: main.c:342 1486 +#: main.c:398
1497 msgid "Parse error" 1487 msgid "Parse error"
1498 msgstr "" 1488 msgstr ""
1499 1489
@@ -1522,7 +1512,7 @@ msgstr &quot;&quot; @@ -1522,7 +1512,7 @@ msgstr &quot;&quot;
1522 msgid "Path and name of the local file" 1512 msgid "Path and name of the local file"
1523 msgstr "" 1513 msgstr ""
1524 1514
1525 -#: main.c:313 1515 +#: main.c:367
1526 msgid "Path for plugin files" 1516 msgid "Path for plugin files"
1527 msgstr "" 1517 msgstr ""
1528 1518
@@ -1530,7 +1520,7 @@ msgstr &quot;&quot; @@ -1530,7 +1520,7 @@ msgstr &quot;&quot;
1530 msgid "Path length constraint exceeded" 1520 msgid "Path length constraint exceeded"
1531 msgstr "" 1521 msgstr ""
1532 1522
1533 -#: src/dialogs/security.c:122 src/dialogs/security.c:141 1523 +#: src/dialogs/security.c:127 src/dialogs/security.c:146
1534 msgid "Peer certificate" 1524 msgid "Peer certificate"
1535 msgstr "" 1525 msgstr ""
1536 1526
@@ -1716,7 +1706,7 @@ msgstr &quot;&quot; @@ -1716,7 +1706,7 @@ msgstr &quot;&quot;
1716 msgid "Remap Failed" 1706 msgid "Remap Failed"
1717 msgstr "" 1707 msgstr ""
1718 1708
1719 -#: main.c:310 1709 +#: main.c:364
1720 msgid "Remap charset from xml file" 1710 msgid "Remap charset from xml file"
1721 msgstr "" 1711 msgstr ""
1722 1712
@@ -1762,7 +1752,7 @@ msgstr &quot;&quot; @@ -1762,7 +1752,7 @@ msgstr &quot;&quot;
1762 msgid "Return" 1752 msgid "Return"
1763 msgstr "" 1753 msgstr ""
1764 1754
1765 -#: src/dialogs/security.c:128 1755 +#: src/dialogs/security.c:133
1766 msgid "Revocation list" 1756 msgid "Revocation list"
1767 msgstr "" 1757 msgstr ""
1768 1758
@@ -1953,7 +1943,7 @@ msgstr &quot;&quot; @@ -1953,7 +1943,7 @@ msgstr &quot;&quot;
1953 msgid "Send file" 1943 msgid "Send file"
1954 msgstr "" 1944 msgstr ""
1955 1945
1956 -#: main.c:316 1946 +#: main.c:372
1957 msgid "Send messages to syslog" 1947 msgid "Send messages to syslog"
1958 msgstr "" 1948 msgstr ""
1959 1949
@@ -1969,11 +1959,11 @@ msgstr &quot;&quot; @@ -1969,11 +1959,11 @@ msgstr &quot;&quot;
1969 msgid "Sending file" 1959 msgid "Sending file"
1970 msgstr "" 1960 msgstr ""
1971 1961
1972 -#: main.c:299 main.c:301 1962 +#: main.c:353 main.c:355
1973 msgid "Session name" 1963 msgid "Session name"
1974 msgstr "" 1964 msgstr ""
1975 1965
1976 -#: main.c:309 1966 +#: main.c:363
1977 msgid "Set host charset" 1967 msgid "Set host charset"
1978 msgstr "" 1968 msgstr ""
1979 1969
@@ -1981,19 +1971,19 @@ msgstr &quot;&quot; @@ -1981,19 +1971,19 @@ msgstr &quot;&quot;
1981 msgid "Set insert mode" 1971 msgid "Set insert mode"
1982 msgstr "" 1972 msgstr ""
1983 1973
1984 -#: main.c:305 1974 +#: main.c:359
1985 msgid "Set reported colors (8/16)" 1975 msgid "Set reported colors (8/16)"
1986 msgstr "" 1976 msgstr ""
1987 1977
1988 -#: main.c:308 1978 +#: main.c:362
1989 msgid "Set toggles OFF" 1979 msgid "Set toggles OFF"
1990 msgstr "" 1980 msgstr ""
1991 1981
1992 -#: main.c:307 1982 +#: main.c:361
1993 msgid "Set toggles ON" 1983 msgid "Set toggles ON"
1994 msgstr "" 1984 msgstr ""
1995 1985
1996 -#: main.c:318 1986 +#: main.c:374
1997 msgid "Set trace filename" 1987 msgid "Set trace filename"
1998 msgstr "" 1988 msgstr ""
1999 1989
@@ -2078,11 +2068,6 @@ msgstr &quot;&quot; @@ -2078,11 +2068,6 @@ msgstr &quot;&quot;
2078 msgid "Starting" 2068 msgid "Starting"
2079 msgstr "" 2069 msgstr ""
2080 2070
2081 -#: gobject.c:189  
2082 -#, c-format  
2083 -msgid "State %04d can't accept requests"  
2084 -msgstr ""  
2085 -  
2086 #: properties.c:132 2071 #: properties.c:132
2087 msgid "State is 3270, TN3270e or SSCP" 2072 msgid "State is 3270, TN3270e or SSCP"
2088 msgstr "" 2073 msgstr ""
@@ -2297,7 +2282,7 @@ msgstr &quot;&quot; @@ -2297,7 +2282,7 @@ msgstr &quot;&quot;
2297 msgid "The model number" 2282 msgid "The model number"
2298 msgstr "" 2283 msgstr ""
2299 2284
2300 -#: main.c:311 2285 +#: main.c:365
2301 msgid "The model of 3270 display to be emulated" 2286 msgid "The model of 3270 display to be emulated"
2302 msgstr "" 2287 msgstr ""
2303 2288
@@ -2360,7 +2345,7 @@ msgstr &quot;&quot; @@ -2360,7 +2345,7 @@ msgstr &quot;&quot;
2360 msgid "There's no available settings for charset \"%s\"" 2345 msgid "There's no available settings for charset \"%s\""
2361 msgstr "" 2346 msgstr ""
2362 2347
2363 -#: src/dialogs/security.c:177 2348 +#: src/dialogs/security.c:182
2364 msgid "There's no security information in the session" 2349 msgid "There's no security information in the session"
2365 msgstr "" 2350 msgstr ""
2366 2351
@@ -2385,7 +2370,7 @@ msgid &quot;&quot; @@ -2385,7 +2370,7 @@ msgid &quot;&quot;
2385 "Franklin St, Fifth Floor, Boston, MA 02111-1307 USA" 2370 "Franklin St, Fifth Floor, Boston, MA 02111-1307 USA"
2386 msgstr "" 2371 msgstr ""
2387 2372
2388 -#: main.c:390 2373 +#: main.c:472
2389 #, c-format 2374 #, c-format
2390 msgid "This program requires GTK version %d.%d.%d" 2375 msgid "This program requires GTK version %d.%d.%d"
2391 msgstr "" 2376 msgstr ""
@@ -2514,7 +2499,7 @@ msgstr &quot;&quot; @@ -2514,7 +2499,7 @@ msgstr &quot;&quot;
2514 msgid "Unable to get certificate CRL." 2499 msgid "Unable to get certificate CRL."
2515 msgstr "" 2500 msgstr ""
2516 2501
2517 -#: linux/connect.c:82 2502 +#: linux/connect.c:80
2518 msgid "Unable to get connection state." 2503 msgid "Unable to get connection state."
2519 msgstr "" 2504 msgstr ""
2520 2505
@@ -2574,7 +2559,7 @@ msgstr &quot;&quot; @@ -2574,7 +2559,7 @@ msgstr &quot;&quot;
2574 msgid "Unexpected or invalid attribute value \"%s\"" 2559 msgid "Unexpected or invalid attribute value \"%s\""
2575 msgstr "" 2560 msgstr ""
2576 2561
2577 -#: main.c:153 2562 +#: main.c:157
2578 #, c-format 2563 #, c-format
2579 msgid "Unexpected or invalid color value \"%s\"" 2564 msgid "Unexpected or invalid color value \"%s\""
2580 msgstr "" 2565 msgstr ""
@@ -2583,11 +2568,6 @@ msgstr &quot;&quot; @@ -2583,11 +2568,6 @@ msgstr &quot;&quot;
2583 msgid "Unexpected or unknown security status" 2568 msgid "Unexpected or unknown security status"
2584 msgstr "" 2569 msgstr ""
2585 2570
2586 -#: gobject.c:204  
2587 -#, c-format  
2588 -msgid "Unexpected state %04d"  
2589 -msgstr ""  
2590 -  
2591 #: actions.c:416 2571 #: actions.c:416
2592 #, c-format 2572 #, c-format
2593 msgid "Unexpected target \"%s\"" 2573 msgid "Unexpected target \"%s\""
@@ -2793,7 +2773,7 @@ msgstr &quot;&quot; @@ -2793,7 +2773,7 @@ msgstr &quot;&quot;
2793 msgid "_Cancel" 2773 msgid "_Cancel"
2794 msgstr "" 2774 msgstr ""
2795 2775
2796 -#: src/dialogs/security.c:192 2776 +#: src/dialogs/security.c:197
2797 msgid "_Close" 2777 msgid "_Close"
2798 msgstr "" 2778 msgstr ""
2799 2779
@@ -2894,7 +2874,7 @@ msgstr &quot;&quot; @@ -2894,7 +2874,7 @@ msgstr &quot;&quot;
2894 msgid "connected" 2874 msgid "connected"
2895 msgstr "" 2875 msgstr ""
2896 2876
2897 -#: toggles.c:333 linux/connect.c:278 2877 +#: toggles.c:333 linux/connect.c:229
2898 msgid "disable" 2878 msgid "disable"
2899 msgstr "" 2879 msgstr ""
2900 2880
@@ -2902,7 +2882,7 @@ msgstr &quot;&quot; @@ -2902,7 +2882,7 @@ msgstr &quot;&quot;
2902 msgid "disconnected" 2882 msgid "disconnected"
2903 msgstr "" 2883 msgstr ""
2904 2884
2905 -#: toggles.c:333 linux/connect.c:278 2885 +#: toggles.c:333 linux/connect.c:229
2906 msgid "enable" 2886 msgid "enable"
2907 msgstr "" 2887 msgstr ""
2908 2888
@@ -2922,7 +2902,7 @@ msgstr &quot;&quot; @@ -2922,7 +2902,7 @@ msgstr &quot;&quot;
2922 msgid "lib3270 version" 2902 msgid "lib3270 version"
2923 msgstr "" 2903 msgstr ""
2924 2904
2925 -#: linux/connect.c:265 2905 +#: linux/connect.c:216
2926 msgid "setsockopt(SO_OOBINLINE) has failed" 2906 msgid "setsockopt(SO_OOBINLINE) has failed"
2927 msgstr "" 2907 msgstr ""
2928 2908
src/include/pw3270cpp.h
  Diff comments   View file @2b7e746
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 #endif // _WIN32 117 #endif // _WIN32
118 118
119 public: 119 public:
120 - module(const char *name, const char *version = NULL) throw (std::exception); 120 + module(const char *name, const char *version = NULL);
121 ~module(); 121 ~module();
122 122
123 void * get_symbol(const char *name); 123 void * get_symbol(const char *name);
@@ -291,7 +291,7 @@ @@ -291,7 +291,7 @@
291 291
292 static session * (*factory)(const char *name); 292 static session * (*factory)(const char *name);
293 293
294 - static session * create_remote(const char *name) throw (std::exception); 294 + static session * create_remote(const char *name);
295 295
296 #ifdef HAVE_ICONV 296 #ifdef HAVE_ICONV
297 iconv_t conv2Local; 297 iconv_t conv2Local;
src/libpw3270cpp/Makefile.in
  Diff comments   View file @2b7e746
@@ -59,12 +59,26 @@ VALGRIND=@VALGRIND@ @@ -59,12 +59,26 @@ VALGRIND=@VALGRIND@
59 INSTALL_DATA=@INSTALL_DATA@ 59 INSTALL_DATA=@INSTALL_DATA@
60 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 60 INSTALL_PROGRAM=@INSTALL_PROGRAM@
61 61
62 -CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @DBUS_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270  
63 -LIBS=@LIBS@ @DBUS_LIBS@ @LIBICONV@ 62 +CFLAGS= \
  63 + @CFLAGS@ \
  64 + -Wno-deprecated-declarations \
  65 + -I$(BASEDIR)/src/include \
  66 + @LIB3270_CFLAGS@ \
  67 + @DBUS_CFLAGS@ \
  68 + @GTK_CFLAGS@
  69 +
  70 +LIBS= \
  71 + @LIBS@ \
  72 + @DBUS_LIBS@ \
  73 + @LIBICONV@
64 74
65 #---[ Rules ]---------------------------------------------------------------------------- 75 #---[ Rules ]----------------------------------------------------------------------------
66 76
67 -DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h $(BASEDIR)/src/include/pw3270/*.h *.h Makefile 77 +DEPENDS=\
  78 + $(BASEDIR)/src/include/*.h \
  79 + $(BASEDIR)/src/include/pw3270/*.h \
  80 + *.h \
  81 + Makefile
68 82
69 $(OBJDBG)/%.o: \ 83 $(OBJDBG)/%.o: \
70 %.cc \ 84 %.cc \
@@ -72,10 +86,11 @@ $(OBJDBG)/%.o: \ @@ -72,10 +86,11 @@ $(OBJDBG)/%.o: \
72 86
73 @echo $< ... 87 @echo $< ...
74 @$(MKDIR) `dirname $@` 88 @$(MKDIR) `dirname $@`
75 - @$(CC) $(CFLAGS) \  
76 - @DBG_CFLAGS@ \  
77 - -DBUILD_DATE=`date +"%Y%m%d"`\  
78 - -o $@ -c $< 89 + @$(CC) \
  90 + $(CFLAGS) \
  91 + @DBG_CFLAGS@ \
  92 + -DBUILD_DATE=`date +"%Y%m%d"`\
  93 + -o $@ -c $<
79 94
80 $(OBJRLS)/%.o: \ 95 $(OBJRLS)/%.o: \
81 %.cc \ 96 %.cc \
@@ -84,9 +99,9 @@ $(OBJRLS)/%.o: \ @@ -84,9 +99,9 @@ $(OBJRLS)/%.o: \
84 @echo $< ... 99 @echo $< ...
85 @$(MKDIR) `dirname $@` 100 @$(MKDIR) `dirname $@`
86 @$(CC) $(CFLAGS) \ 101 @$(CC) $(CFLAGS) \
87 - @RLS_CFLAGS@ \  
88 - -DBUILD_DATE=`date +"%Y%m%d"` \  
89 - -o $@ -c $< 102 + @RLS_CFLAGS@ \
  103 + -DBUILD_DATE=`date +"%Y%m%d"` \
  104 + -o $@ -c $<
90 105
91 $(POTDIR)/%.pot: %.c 106 $(POTDIR)/%.pot: %.c
92 107
src/libpw3270cpp/local.cc
  Diff comments   View file @2b7e746
@@ -262,7 +262,7 @@ @@ -262,7 +262,7 @@
262 262
263 public: 263 public:
264 264
265 - local() throw(std::exception) : module("lib3270",PACKAGE_VERSION) 265 + local() : module("lib3270",PACKAGE_VERSION)
266 { 266 {
267 } 267 }
268 268
@@ -545,7 +545,7 @@ @@ -545,7 +545,7 @@
545 545
546 }; 546 };
547 547
548 - session * session::create_local(void) throw (std::exception) 548 + session * session::create_local(void)
549 { 549 {
550 class obj : public local { 550 class obj : public local {
551 public: 551 public:
@@ -590,7 +590,7 @@ @@ -590,7 +590,7 @@
590 return new obj(); 590 return new obj();
591 } 591 }
592 592
593 - session * session::create_local(H3270 *hSession) throw (std::exception) 593 + session * session::create_local(H3270 *hSession)
594 { 594 {
595 class obj : public local { 595 class obj : public local {
596 public: 596 public:
src/libpw3270cpp/module.cc
  Diff comments   View file @2b7e746
@@ -74,7 +74,7 @@ namespace PW3270_NAMESPACE @@ -74,7 +74,7 @@ namespace PW3270_NAMESPACE
74 } 74 }
75 #endif // _WIN32 75 #endif // _WIN32
76 76
77 - module::module(const char *name, const char *version) throw (std::exception) 77 + module::module(const char *name, const char *version)
78 { 78 {
79 string dllname = name; 79 string dllname = name;
80 80
src/libpw3270cpp/private.h
  Diff comments   View file @2b7e746
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 namespace PW3270_NAMESPACE 111 namespace PW3270_NAMESPACE
112 { 112 {
113 113
114 - session * create_service_client(const char *session) throw (std::exception); 114 + session * create_service_client(const char *session);
115 115
116 } 116 }
117 117
src/libpw3270cpp/remote.cc
  Diff comments   View file @2b7e746
@@ -507,7 +507,7 @@ @@ -507,7 +507,7 @@
507 507
508 #endif // defined 508 #endif // defined
509 509
510 - remote(const char *session) throw (std::exception) 510 + remote(const char *session)
511 { 511 {
512 #if defined(_WIN32) 512 #if defined(_WIN32)
513 static DWORD dwMode = PIPE_READMODE_MESSAGE; 513 static DWORD dwMode = PIPE_READMODE_MESSAGE;
@@ -1654,7 +1654,7 @@ @@ -1654,7 +1654,7 @@
1654 1654
1655 }; 1655 };
1656 1656
1657 - session * session::create_remote(const char *session) throw (std::exception) 1657 + session * session::create_remote(const char *session)
1658 { 1658 {
1659 debug("create(%s)",session); 1659 debug("create(%s)",session);
1660 1660
src/libpw3270cpp/service.cc
  Diff comments   View file @2b7e746
@@ -268,7 +268,7 @@ @@ -268,7 +268,7 @@
268 } 268 }
269 269
270 public: 270 public:
271 - client(const char *session) throw (std::exception) 271 + client(const char *session)
272 { 272 {
273 DBusError err; 273 DBusError err;
274 274
@@ -613,7 +613,7 @@ @@ -613,7 +613,7 @@
613 613
614 }; 614 };
615 615
616 - session * create_service_client(const char *session) throw (std::exception) 616 + session * create_service_client(const char *session)
617 { 617 {
618 return new client(session); 618 return new client(session);
619 } 619 }
src/libpw3270cpp/session.cc
  Diff comments   View file @2b7e746
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
164 } 164 }
165 165
166 // Factory methods and settings 166 // Factory methods and settings
167 - session * session::create(const char *name) throw (std::exception) 167 + session * session::create(const char *name)
168 { 168 {
169 session *rc = nullptr; 169 session *rc = nullptr;
170 170
src/plugins/hllapi/Makefile.in
  Diff comments   View file @2b7e746
@@ -66,11 +66,26 @@ INSTALL_DATA=@INSTALL_DATA@ @@ -66,11 +66,26 @@ INSTALL_DATA=@INSTALL_DATA@
66 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 66 INSTALL_PROGRAM=@INSTALL_PROGRAM@
67 LN_S=@LN_S@ 67 LN_S=@LN_S@
68 68
69 -CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -I$(BASEDIR)/src/include 69 +CFLAGS=\
  70 + @CFLAGS@ \
  71 + @LIBV3270_CFLAGS@ \
  72 + @GTK_CFLAGS@ \
  73 + -I$(BASEDIR)/src/include
70 74
71 LIBS=@LIBS@ 75 LIBS=@LIBS@
72 -API_LIBS=$(LIBS) -lpw3270cpp @LIBICONV@  
73 -PLUGIN_LIBS=$(LIBS) @GTK_LIBS@ @GLIB_LIBS@ @LIB3270_LIBS@ @PW3270_LIBS@ 76 +
  77 +API_LIBS=\
  78 + $(LIBS) \
  79 + -lpw3270cpp \
  80 + @LIBICONV@
  81 +
  82 +PLUGIN_LIBS=\
  83 + $(LIBS) \
  84 + @GTK_LIBS@ \
  85 + @GLIB_LIBS@ \
  86 + @LIB3270_LIBS@ \
  87 + @LIBV3270_LIBS@ \
  88 + @PW3270_LIBS@
74 89
75 #---[ Rules ]---------------------------------------------------------------------------- 90 #---[ Rules ]----------------------------------------------------------------------------
76 91
@@ -83,9 +98,9 @@ $(OBJDBG)/%.o: \ @@ -83,9 +98,9 @@ $(OBJDBG)/%.o: \
83 @echo $< ... 98 @echo $< ...
84 @$(MKDIR) `dirname $@` 99 @$(MKDIR) `dirname $@`
85 @$(CC) $(CFLAGS) \ 100 @$(CC) $(CFLAGS) \
86 - @DBG_CFLAGS@ \  
87 - -DBUILD_DATE=`date +"0x%Y%m%d"`\  
88 - -o $@ -c $< 101 + @DBG_CFLAGS@ \
  102 + -DBUILD_DATE=`date +"0x%Y%m%d"`\
  103 + -o $@ -c $<
89 104
90 $(OBJDBG)/%.o: \ 105 $(OBJDBG)/%.o: \
91 %.cc \ 106 %.cc \
@@ -94,9 +109,9 @@ $(OBJDBG)/%.o: \ @@ -94,9 +109,9 @@ $(OBJDBG)/%.o: \
94 @echo $< ... 109 @echo $< ...
95 @$(MKDIR) `dirname $@` 110 @$(MKDIR) `dirname $@`
96 @$(CXX) $(CFLAGS) \ 111 @$(CXX) $(CFLAGS) \
97 - @DBG_CFLAGS@ \  
98 - -DBUILD_DATE=`date +"0x%Y%m%d"`\  
99 - -o $@ -c $< 112 + @DBG_CFLAGS@ \
  113 + -DBUILD_DATE=`date +"0x%Y%m%d"`\
  114 + -o $@ -c $<
100 115
101 $(OBJRLS)/%.o: \ 116 $(OBJRLS)/%.o: \
102 %.c \ 117 %.c \
@@ -105,9 +120,9 @@ $(OBJRLS)/%.o: \ @@ -105,9 +120,9 @@ $(OBJRLS)/%.o: \
105 @echo $< ... 120 @echo $< ...
106 @$(MKDIR) `dirname $@` 121 @$(MKDIR) `dirname $@`
107 @$(CC) $(CFLAGS) \ 122 @$(CC) $(CFLAGS) \
108 - @RLS_CFLAGS@ \  
109 - -DBUILD_DATE=`date +"0x%Y%m%d"` \  
110 - -o $@ -c $< 123 + @RLS_CFLAGS@ \
  124 + -DBUILD_DATE=`date +"0x%Y%m%d"` \
  125 + -o $@ -c $<
111 126
112 $(OBJRLS)/%.o: \ 127 $(OBJRLS)/%.o: \
113 %.cc \ 128 %.cc \
@@ -116,9 +131,9 @@ $(OBJRLS)/%.o: \ @@ -116,9 +131,9 @@ $(OBJRLS)/%.o: \
116 @echo $< ... 131 @echo $< ...
117 @$(MKDIR) `dirname $@` 132 @$(MKDIR) `dirname $@`
118 @$(CXX) $(CFLAGS) \ 133 @$(CXX) $(CFLAGS) \
119 - @RLS_CFLAGS@ \  
120 - -DBUILD_DATE=`date +"0x%Y%m%d"` \  
121 - -o $@ -c $< 134 + @RLS_CFLAGS@ \
  135 + -DBUILD_DATE=`date +"0x%Y%m%d"` \
  136 + -o $@ -c $<
122 137
123 $(POTDIR)/%.pot: %.c 138 $(POTDIR)/%.pot: %.c
124 139
src/plugins/hllapi/pluginmain.c
  Diff comments   View file @2b7e746
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 #endif // _WIN32 40 #endif // _WIN32
41 41
42 #include <pw3270/plugin.h> 42 #include <pw3270/plugin.h>
43 - #include <pw3270/v3270.h> 43 + #include <v3270.h>
44 #include <pw3270/ipcpackets.h> 44 #include <pw3270/ipcpackets.h>
45 #include <lib3270/actions.h> 45 #include <lib3270/actions.h>
46 #include <lib3270/charset.h> 46 #include <lib3270/charset.h>
@@ -205,10 +205,7 @@ @@ -205,10 +205,7 @@
205 } 205 }
206 206
207 static void get_host(pipe_source *source) { 207 static void get_host(pipe_source *source) {
208 - char buffer[1024];  
209 - memset(buffer,0,sizeof(buffer));  
210 - lib3270_get_url(lib3270_get_default_session_handle(),buffer,sizeof(buffer));  
211 - send_text(source,buffer); 208 + send_text(source,strdup(lib3270_get_url(lib3270_get_default_session_handle())));
212 } 209 }
213 210
214 static void process_input(pipe_source *source, DWORD cbRead) 211 static void process_input(pipe_source *source, DWORD cbRead)
@@ -220,7 +217,7 @@ @@ -220,7 +217,7 @@
220 switch(query->packet_id) 217 switch(query->packet_id)
221 { 218 {
222 case HLLAPI_PACKET_CONNECT: 219 case HLLAPI_PACKET_CONNECT:
223 - send_result(source,lib3270_connect( lib3270_get_default_session_handle(), 220 + send_result(source,lib3270_reconnect( lib3270_get_default_session_handle(),
224 ((struct hllapi_packet_connect *) source->buffer)->wait)); 221 ((struct hllapi_packet_connect *) source->buffer)->wait));
225 break; 222 break;
226 223
@@ -229,8 +226,8 @@ @@ -229,8 +226,8 @@
229 break; 226 break;
230 227
231 case HLLAPI_PACKET_SET_HOST: 228 case HLLAPI_PACKET_SET_HOST:
232 - send_result(source,lib3270_set_url( lib3270_get_default_session_handle(),  
233 - ((struct hllapi_packet_text *) source->buffer)->text) != NULL); 229 + send_result(source,lib3270_set_url(lib3270_get_default_session_handle(),
  230 + ((struct hllapi_packet_text *) source->buffer)->text));
234 break; 231 break;
235 232
236 case HLLAPI_PACKET_GET_HOST: 233 case HLLAPI_PACKET_GET_HOST:
@@ -254,7 +251,7 @@ @@ -254,7 +251,7 @@
254 break; 251 break;
255 252
256 case HLLAPI_PACKET_PRINT: 253 case HLLAPI_PACKET_PRINT:
257 - send_result(source,lib3270_print(lib3270_get_default_session_handle())); 254 + send_result(source,lib3270_print_all(lib3270_get_default_session_handle()));
258 break; 255 break;
259 256
260 case HLLAPI_PACKET_ERASE: 257 case HLLAPI_PACKET_ERASE:
@@ -672,5 +669,5 @@ @@ -672,5 +669,5 @@
672 G_GNUC_INTERNAL void set_active(gboolean on) 669 G_GNUC_INTERNAL void set_active(gboolean on)
673 { 670 {
674 trace("%s(%s)",__FUNCTION__,on ? "Active" : "Inactive"); 671 trace("%s(%s)",__FUNCTION__,on ? "Active" : "Inactive");
675 - v3270_set_script(v3270_get_default_widget(),'H',on); 672 + // v3270_set_script(v3270_get_default_widget(),'H');
676 } 673 }