From 224bbafc6f446545277814115b38d79e44aeb899 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 2 Oct 2019 14:37:47 -0300 Subject: [PATCH] Fixing bugs caused by updates on libipc3270. --- configure.ac | 4 ++-- gitsync.sh | 21 ++++++++++++++------- pw3270-sharp.cbp | 17 +++++++++++------ src/native/core/actions.cc | 2 +- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index b91d56d..531b7dd 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ AC_PREREQ(2.61) dnl Initialise automake with the package name, version and dnl bug-reporting address. -AC_INIT([lib3270-mono-bindings], [5.2], [perry.werneck@gmail.com]) +AC_INIT([mono-tn3270], [5.2], [perry.werneck@gmail.com]) dnl Place auxilliary scripts here. AC_CONFIG_AUX_DIR([scripts]) @@ -138,7 +138,7 @@ dnl --------------------------------------------------------------------------- dnl Version info dnl --------------------------------------------------------------------------- -AC_SUBST(PACKAGE_DESCRIPTION,".NET Bindings for lib3270/pw3270") +AC_SUBST(PACKAGE_DESCRIPTION,"A .NET library for TN3270") app_cv_zipname=$PACKAGE app_vrs_major=$(echo $VERSION | cut -d. -f1) diff --git a/gitsync.sh b/gitsync.sh index 670632c..3d89d0a 100755 --- a/gitsync.sh +++ b/gitsync.sh @@ -1,27 +1,34 @@ #!/bin/bash # # https://help.github.com/articles/syncing-a-fork/ +# # https://help.github.com/articles/configuring-a-remote-for-a-fork/ +# # https://www.opentechguides.com/how-to/article/git/177/git-sync-repos.html # # Setup: # -# git remote add --mirror=fetch secondary https://secondary_repo_url/secondary_repo.git -# git fetch origin -# git push secondary --all +# git remote add github https://github.com/PerryWerneck/lib3270.git # # git push git fetch origin -git checkout master -git merge origin/master +git merge -for repo in $(git remote -v | grep -v origin | grep "(push)" | awk '{print $1}') +REPOS=$(git remote -v | grep -v origin | grep "(push)" | awk '{print $1}') + +for repo in ${REPOS} +do + echo "Getting updates from ${repo} ..." + git fetch ${repo} + git merge +done + +for repo in ${REPOS} do echo "Updating ${repo} ..." git push ${repo} done - diff --git a/pw3270-sharp.cbp b/pw3270-sharp.cbp index 8124f09..ed05a28 100644 --- a/pw3270-sharp.cbp +++ b/pw3270-sharp.cbp @@ -43,14 +43,19 @@ + - - - - + + + + + + + + - - + + diff --git a/src/native/core/actions.cc b/src/native/core/actions.cc index 1fffb4e..1fd1b2f 100644 --- a/src/native/core/actions.cc +++ b/src/native/core/actions.cc @@ -70,7 +70,7 @@ } -static int action(TN3270::Host *ses, TN3270::Action id) noexcept { +static int action(TN3270::Host *ses, TN3270::KeyboardAction id) noexcept { return action(ses, [id](TN3270::Host &ses) { ses.push(id); -- libgit2 0.21.2