Download as
Browse Code »

Commit 6338314bd526fd5455dbb3c599f44c7e2dfbf694

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

Updating windows package info 

Using the new LIB3270_ACTION object for trace window commands.
Showing 3 changed files with 29 additions and 38 deletions   Show diff stats
src/trace/exec.c
  Diff comments   View file @6338314
@@ -168,11 +168,6 @@ @@ -168,11 +168,6 @@
168 168
169 debug("cmdline: \"%s\"",cmdline); 169 debug("cmdline: \"%s\"",cmdline);
170 170
171 - if(g_str_has_prefix(cmdline,"connect"))  
172 - {  
173 - return lib3270_reconnect(hSession,0);  
174 - }  
175 -  
176 if(g_str_has_prefix(cmdline,"reload")) 171 if(g_str_has_prefix(cmdline,"reload"))
177 { 172 {
178 v3270_reload(widget); 173 v3270_reload(widget);
@@ -286,11 +281,6 @@ @@ -286,11 +281,6 @@
286 return set_property(widget,cmdline,value); 281 return set_property(widget,cmdline,value);
287 } 282 }
288 283
289 - if(g_str_has_prefix(cmdline,"disconnect"))  
290 - {  
291 - return lib3270_disconnect(hSession);  
292 - }  
293 -  
294 if(g_str_has_prefix(cmdline,"remap")) 284 if(g_str_has_prefix(cmdline,"remap"))
295 { 285 {
296 gchar *txtptr = cmdline+5; 286 gchar *txtptr = cmdline+5;
@@ -332,16 +322,23 @@ @@ -332,16 +322,23 @@
332 else 322 else
333 { 323 {
334 // Check for lib3270 actions. 324 // Check for lib3270 actions.
335 - const LIB3270_ACTION_ENTRY *actions = lib3270_get_action_table(); 325 + const LIB3270_ACTION * actions = lib3270_get_actions();
336 326
337 for(ix=0; actions[ix].name; ix++) 327 for(ix=0; actions[ix].name; ix++)
338 { 328 {
339 if(!g_ascii_strcasecmp(actions[ix].name,cmdline)) 329 if(!g_ascii_strcasecmp(actions[ix].name,cmdline))
340 { 330 {
341 - lib3270_trace_event(hSession,"Action: %s\n",actions[ix].name);  
342 - return actions[ix].call(hSession); 331 + if(actions[ix].enabled(hSession))
  332 + {
  333 + lib3270_trace_event(hSession,"Activating action \"%s\"\n",actions[ix].name);
  334 + return actions[ix].activate(hSession);
  335 + }
  336 + else
  337 + {
  338 + lib3270_trace_event(hSession,"Action \"%s\" is disabled\n",actions[ix].name);
  339 + return EPERM;
  340 + }
343 } 341 }
344 -  
345 } 342 }
346 343
347 } 344 }
win/x86_32/mingw32-libv3270.spec
  Diff comments   View file @6338314
@@ -16,11 +16,6 @@ @@ -16,11 +16,6 @@
16 # Please submit bugfixes or comments via http://bugs.opensuse.org/ 16 # Please submit bugfixes or comments via http://bugs.opensuse.org/
17 # 17 #
18 18
19 -%define MAJOR_VERSION 5  
20 -%define MINOR_VERSION 2  
21 -  
22 -%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}  
23 -%define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270)  
24 19
25 %define __strip %{_mingw32_strip} 20 %define __strip %{_mingw32_strip}
26 %define __objdump %{_mingw32_objdump} 21 %define __objdump %{_mingw32_objdump}
@@ -32,11 +27,17 @@ @@ -32,11 +27,17 @@
32 27
33 #---[ Main package ]-------------------------------------------------------------------------------------------------- 28 #---[ Main package ]--------------------------------------------------------------------------------------------------
34 29
35 -Summary: 3270 Virtual Terminal for GTK  
36 -Name: mingw32-libv3270-%{_libvrs}  
37 -Version: 5.2  
38 -Release: 0  
39 -License: GPL-2.0 30 +Summary: 3270 Virtual Terminal for GTK
  31 +Name: mingw32-libv3270
  32 +Version: 5.2
  33 +
  34 +%define MAJOR_VERSION %(echo %{version} | cut -d. -f1)
  35 +%define MINOR_VERSION %(echo %{version} | cut -d. -f2)
  36 +%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
  37 +%define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270)
  38 +
  39 +Release: 0
  40 +License: GPL-2.0
40 41
41 Source: libv3270-%{version}.tar.xz 42 Source: libv3270-%{version}.tar.xz
42 43
@@ -45,11 +46,7 @@ Url: https://github.com/PerryWerneck/libv3270.git @@ -45,11 +46,7 @@ Url: https://github.com/PerryWerneck/libv3270.git
45 Group: Development/Libraries/C and C++ 46 Group: Development/Libraries/C and C++
46 BuildRoot: /var/tmp/%{name}-%{version} 47 BuildRoot: /var/tmp/%{name}-%{version}
47 48
48 -Provides: mingw32-libv3270  
49 -Conflicts: otherproviders(mingw32-libv3270)  
50 -  
51 Provides: mingw32(lib:v3270) 49 Provides: mingw32(lib:v3270)
52 -Provides: mingw32(lib:v3270-%{_libvrs})  
53 50
54 BuildRequires: autoconf 51 BuildRequires: autoconf
55 BuildRequires: automake 52 BuildRequires: automake
win/x86_64/mingw64-libv3270.spec
  Diff comments   View file @6338314
@@ -16,11 +16,6 @@ @@ -16,11 +16,6 @@
16 # Please submit bugfixes or comments via http://bugs.opensuse.org/ 16 # Please submit bugfixes or comments via http://bugs.opensuse.org/
17 # 17 #
18 18
19 -%define MAJOR_VERSION 5  
20 -%define MINOR_VERSION 2  
21 -  
22 -%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}  
23 -%define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270)  
24 19
25 %define __strip %{_mingw64_strip} 20 %define __strip %{_mingw64_strip}
26 %define __objdump %{_mingw64_objdump} 21 %define __objdump %{_mingw64_objdump}
@@ -33,8 +28,14 @@ @@ -33,8 +28,14 @@
33 #---[ Main package ]-------------------------------------------------------------------------------------------------- 28 #---[ Main package ]--------------------------------------------------------------------------------------------------
34 29
35 Summary: 3270 Virtual Terminal for GTK 30 Summary: 3270 Virtual Terminal for GTK
36 -Name: mingw64-libv3270-%{_libvrs} 31 +Name: mingw64-libv3270
37 Version: 5.2 32 Version: 5.2
  33 +
  34 +%define MAJOR_VERSION %(echo %{version} | cut -d. -f1)
  35 +%define MINOR_VERSION %(echo %{version} | cut -d. -f2)
  36 +%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
  37 +%define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270)
  38 +
38 Release: 0 39 Release: 0
39 License: GPL-2.0 40 License: GPL-2.0
40 41
@@ -45,11 +46,7 @@ Url: https://github.com/PerryWerneck/libv3270.git @@ -45,11 +46,7 @@ Url: https://github.com/PerryWerneck/libv3270.git
45 Group: Development/Libraries/C and C++ 46 Group: Development/Libraries/C and C++
46 BuildRoot: /var/tmp/%{name}-%{version} 47 BuildRoot: /var/tmp/%{name}-%{version}
47 48
48 -Provides: mingw64-libv3270  
49 -Conflicts: otherproviders(mingw64-libv3270)  
50 -  
51 Provides: mingw64(lib:v3270) 49 Provides: mingw64(lib:v3270)
52 -Provides: mingw64(lib:v3270-%{_libvrs})  
53 50
54 BuildRequires: autoconf 51 BuildRequires: autoconf
55 BuildRequires: automake 52 BuildRequires: automake