From 35d8292f6d656945f2f60cf06c3749b3c6b7fbc8 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Thu, 21 Feb 2013 20:03:00 +0000 Subject: [PATCH] Preparando para empacotamento do plugin dbus --- Makefile.in | 17 ++++++++++------- configure.ac | 6 +++--- man/man1/pw3270.1 | 28 ++++++++++++++-------------- po/pt_BR.po | 8 ++++---- pw3270.cbp | 1 + src/include/plugin.mak.in | 11 ++++++----- src/lib3270/selection.c | 11 +++++++---- src/plugins/dbus3270/Makefile.in | 37 ++++++++++++++++++++++++++----------- src/plugins/dbus3270/gobject.c | 31 +++++++++++++++++++++++++++++++ src/plugins/dbus3270/pw3270dbus.xml | 6 ++++++ src/plugins/dbus3270/service.h | 2 +- src/plugins/rx3270/Makefile.in | 5 +++-- src/pw3270/uiparser/keypad.c | 2 +- src/pw3270/uiparser/parsefile.c | 2 +- 14 files changed, 114 insertions(+), 53 deletions(-) diff --git a/Makefile.in b/Makefile.in index 339f513..7c24533 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,6 +76,8 @@ AMTAR=@AMTAR@ DBGCMDPREFIX=@DBGCMDPREFIX@ MAKENSIS=@MAKENSIS@ +PLUGIN_RELEASE_ARGS=LIB3270_MODE=Release + #---[ Rules ]------------------------------------------------------------------ %.tar.bz2: %.tar @@ -130,7 +132,7 @@ $(BINDIR)/Debug/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Debug/$(PACKAGE_TAR @make BINDIR="../../../$(BINDIR)" PW3270_LIBS="-L../../../$(BINDIR)/Debug@DLLDIR@ -l3270 -lpw3270" PW3270_CFLAGS="-I../../../src/include" -C $(dir $<) Debug $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) - @make BINDIR="../../../$(BINDIR)" PW3270_LIBS="-L../../../$(BINDIR)/Release@DLLDIR@ -l3270 -lpw3270" PW3270_CFLAGS="-I../../../src/include" -C $(dir $<) Release + @make $(PLUGIN_RELEASE_ARGS) -C $(dir $<) Release #---[ Release targets ]-------------------------------------------------------- @@ -262,7 +264,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) @echo $@ -install: install-sdk install-lib install-app install-man +install: install-sdk install-lib install-app install-man install-plugins install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install @@ -270,6 +272,9 @@ install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale @$(INSTALL_DATA) colors.conf $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui +install-plugins: $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) + @echo -e $(foreach PLUGIN, $(PLUGINS), $(MAKE) DESTDIR=$(DESTDIR) $(PLUGIN_RELEASE_ARGS) -C src/plugins/$(PLUGIN) install\\n ) | $(SHELL) + install-lib: $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ @$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install @@ -278,14 +283,12 @@ locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/ install-locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) @echo -e $(foreach MO, $(notdir $(basename $(LANG_FILES))), mkdir -p $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES\\n$(INSTALL_DATA) $(BINDIR)/Release/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo \\n ) | $(SHELL) - install-man: @$(MKDIR) $(DESTDIR)$(mandir)/man1 @$(INSTALL_DATA) man/man1/pw3270.1 $(DESTDIR)/$(mandir)/man1/pw3270.1 @$(MKDIR) $(DESTDIR)$(mandir)/man5 @$(INSTALL_DATA) man/man5/pw3270.5 $(DESTDIR)/$(mandir)/man5/pw3270.5 - install-sdk: @$(MKDIR) $(DESTDIR)$(includedir)/lib3270 @$(INSTALL_DATA) src/include/lib3270.h $(DESTDIR)/$(includedir) @@ -349,16 +352,16 @@ $(BINDIR)/Debug/plugins/remotectl@DLLEXT@: src/plugins/remotectl/* $(BINDIR)/Deb @make BINDIR="../../../$(BINDIR)" PW3270_LIBS="-L../../../$(BINDIR)/Debug@DLLDIR@ -l3270 -lpw3270" PW3270_CFLAGS="-I../../../src/include" -C $(dir $<) Debug $(BINDIR)/Release/plugins/remotectl@DLLEXT@: src/plugins/remotectl/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) - @make BINDIR="../../../$(BINDIR)" PW3270_LIBS="-L../../../$(BINDIR)/Release@DLLDIR@ -l3270 -lpw3270" PW3270_CFLAGS="-I../../../src/include" -C $(dir $<) Release + @make $(PLUGIN_RELEASE_ARGS) -C $(dir $<) Release $(BINDIR)/Debug/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Debug -C $(dir $<) Debug $(BINDIR)/Release/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) - @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Release -C $(dir $<) Release + @make $(PLUGIN_RELEASE_ARGS) -C $(dir $<) Release $(BINDIR)/Debug/plugins/dbus3270@DLLEXT@: src/plugins/dbus3270/* $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Debug -C $(dir $<) Debug $(BINDIR)/Release/plugins/dbus3270@DLLEXT@: src/plugins/dbus3270/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) - @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Release -C $(dir $<) Release + @make $(PLUGIN_RELEASE_ARGS) -C $(dir $<) Release diff --git a/configure.ac b/configure.ac index 759ca36..8a61033 100644 --- a/configure.ac +++ b/configure.ac @@ -353,9 +353,9 @@ PKG_CHECK_MODULES( [DBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No DBU AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_CFLAGS) -#if test "$app_cv_dbus" == "yes"; then -# PLUGINS="$PLUGINS dbus3270" -#fi +if test "$app_cv_dbus" == "yes"; then + PLUGINS="$PLUGINS dbus3270" +fi #--[ SSL ]---------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/man/man1/pw3270.1 b/man/man1/pw3270.1 index ccbd707..4bc73fe 100644 --- a/man/man1/pw3270.1 +++ b/man/man1/pw3270.1 @@ -7,23 +7,23 @@ pw3270 \- a modern tn3270 emulator .SH SYNOPSIS .B pw3270 [-a .I application-name -.B ] [-h +.B ] [-h .I hostname:port -.B ] [-s +.B ] [-s .I session name .B ] -.B ] [-c +.B ] [-c .I session colors -.B ] [-t +.B ] [-t .I system type -.B ] [-a +.B ] [-a .I application name .B ] .SH DESCRIPTION -.B pw3270 -is a modern, GTK-based, completely free tn3270 emulator. +.B pw3270 +is a modern, GTK-based, completely free tn3270 emulator. -Based on the original x3270 code by Paul Mattes, it was created originally for Banco do Brasil. It's now an official Brazilian Government Public Software project, and is used worldwide. +Based on the original x3270 code by Paul Mattes, it was created originally for Banco do Brasil. It's now an official Brazilian Government Public Software project, and is used worldwide. pw3270 is fully themable, and each element on the screen can be individually customized through the configuration files. It also supports all kinds of monospaced TrueType and bitmap fonts your system already supports. @@ -34,7 +34,7 @@ File transfers are supported, for uploads and downloads. Printing is implemented using the native GTK print dialogs. -In addition to the modern GUI, a development library +In addition to the modern GUI, a development library .BR lib3270 (3) has been created to allow you to create your own programs using the 3270 protocol. @@ -42,13 +42,13 @@ has been created to allow you to create your own programs using the 3270 protoco .IP "--help" Shows the available options. .IP "-h hostname:port" -Connects to the host and port specified. Use the form -.I "s:hostname:port" +Connects to the host and port specified. Use the form +.I "s:hostname:port" for a secure (SSL) connection. .IP "-a application-name" -Specifies an alternate window title. This is useful if you want to name each host window differently (with the service name or host address, for example). The default is to always name the window "pw3270". +Specifies an alternate window title. This is useful if you want to name each host window differently (with the service name or host address, for example). The default is to always name the window "pw3270". .IP "-s session-name" -Specifies an anternate session-name. This affects some plugins who does IPC communications +Specifies an anternate session-name. This affects some plugins who does IPC communications, like the dbus one. .IP "-c Change the reported colors" Change the response to a Query(Color); when 8 pw3270 will respond with a list of 8 supported colors; when 16 the response will be a list of the 16 standard colors. .IP "-t Change systemtype" @@ -70,7 +70,7 @@ Perry Werneck Erico Mendonca -The official project page is located at http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270 . +The official project page is located at http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270 . .SH "SEE ALSO" .BR pw3270 (5) diff --git a/po/pt_BR.po b/po/pt_BR.po index 9fa778b..bb4a588 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-21 10:43-0300\n" +"POT-Creation-Date: 2013-02-21 17:02-0300\n" "PO-Revision-Date: 2013-01-14 09:49-0200\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" @@ -334,7 +334,7 @@ msgstr "Não foi possível conectar ao servidor" msgid "Can't convert line %d from %s to %s" msgstr "Não foi possível converter a linha %d de %s para %s" -#: selection.c:631 +#: selection.c:634 msgid "Can't cut rectangular regions" msgstr "Recortar não permitido em seleção retangular" @@ -855,7 +855,7 @@ msgstr "Invalid CGCSGID '%s', ignoring" msgid "Invalid charset entry '%s' (#%d)" msgstr "Invalid charset entry '%s' (#%d)" -#: selection.c:631 +#: selection.c:634 msgid "Invalid cut action" msgstr "Ação recortar inválida" @@ -961,7 +961,7 @@ msgstr "Normal/Protegido" msgid "Normal/Unprotected" msgstr "Normal/Desprotegido" -#: selection.c:631 +#: selection.c:634 msgid "Not available" msgstr "Não disponível" diff --git a/pw3270.cbp b/pw3270.cbp index 969f48f..e07b3aa 100644 --- a/pw3270.cbp +++ b/pw3270.cbp @@ -54,6 +54,7 @@ + diff --git a/src/include/plugin.mak.in b/src/include/plugin.mak.in index fff786f..9ec20aa 100644 --- a/src/include/plugin.mak.in +++ b/src/include/plugin.mak.in @@ -59,16 +59,17 @@ DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@ PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@ ifeq ($(LIB3270_MODE),Debug) - PW3270_LIBS=-L$(BINDBG)@DLLDIR@ -l3270 - PW3270_CFLAGS=-I../../../src/include - LIB3270_LIBS=-L$(BINDBG)@DLLDIR@ -l3270 + PW3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -lpw3270" + PW3270_CFLAGS="-I../../../src/include" + LIB3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -l3270" LIB270_CFLAGS=-I../../../src/include endif ifeq ($(LIB3270_MODE),Release) - PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270 + BINRLS=../../../.bin/Release + PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -lpw3270 PW3270_CFLAGS=-I../../../src/include - LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270 + LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270 LIB270_CFLAGS=-I../../../src/include endif diff --git a/src/lib3270/selection.c b/src/lib3270/selection.c index 9161555..602377f 100644 --- a/src/lib3270/selection.c +++ b/src/lib3270/selection.c @@ -380,7 +380,10 @@ static char * get_text(H3270 *hSession,unsigned char all) size_t sz = 0; if(!(lib3270_connected(hSession) && hSession->text)) + { + errno = ENOTCONN; return NULL; + } ret = lib3270_malloc(buflen); @@ -406,6 +409,7 @@ static char * get_text(H3270 *hSession,unsigned char all) if(!sz) { lib3270_free(ret); + errno = ENOENT; return NULL; } else if(sz > 1 && ret[sz-1] == '\n') // Remove ending \n @@ -462,7 +466,10 @@ LIB3270_EXPORT char * lib3270_get_text(H3270 *h, int offset, int len) CHECK_SESSION_HANDLE(h); if(!lib3270_connected(h)) + { + errno = ENOTCONN; return NULL; + } maxlen = (h->rows * (h->cols+1)) - offset; if(maxlen <= 0 || offset < 0) @@ -505,10 +512,6 @@ LIB3270_EXPORT char * lib3270_get_text(H3270 *h, int offset, int len) LIB3270_EXPORT char * lib3270_get_text_at(H3270 *h, int row, int col, int len) { CHECK_SESSION_HANDLE(h); - - if(!lib3270_connected(h)) - return NULL; - return lib3270_get_text(h, ((row-1) * h->cols) + (col-1), len); } diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in index 2345d29..c1b27dc 100644 --- a/src/plugins/dbus3270/Makefile.in +++ b/src/plugins/dbus3270/Makefile.in @@ -26,9 +26,18 @@ # kraucer@bb.com.br (Kraucer Fernandes Mazuco) # +PACKAGE_NAME=@PACKAGE_NAME@ +MODULE_NAME=dbus3270 + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libdir=@libdir@ +datarootdir=@datarootdir@ +localedir=@localedir@ + #---[ Sources ]---------------------------------------------------------------- -MODULE_NAME=dbus3270 DEPENDS=Makefile dbus-glue.h PLUGIN_SRC=main.c gobject.c misc.c DAEMON_SRC=daemon.c gobject.c iocallback.c misc.c @@ -51,6 +60,9 @@ MKDIR=@MKDIR_P@ CC=@CC@ LD=@CC@ DBUSBINDINGTOOL=@DBUSBINDINGTOOL@ +INSTALL=@INSTALL@ +INSTALL_PROGRAM=@INSTALL_PROGRAM@ +INSTALL_DATA=@INSTALL_DATA@ #---[ Flags ]------------------------------------------------------------------ @@ -69,27 +81,26 @@ GLIB_LIBS=@GLIB_LIBS@ GTK_LIBS=@GTK_LIBS@ ifeq ($(LIB3270_MODE),Debug) - PW3270_LIBS=-L$(BINDBG)@DLLDIR@ -lpw3270 - PW3270_CFLAGS=-I../../../src/include - LIB3270_LIBS=-L$(BINDBG)@DLLDIR@ -l3270 + PW3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -lpw3270" + PW3270_CFLAGS="-I../../../src/include" + LIB3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -l3270" LIB270_CFLAGS=-I../../../src/include endif ifeq ($(LIB3270_MODE),Release) - PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -lṕw3270 - PW3270_CFLAGS=-I../../../src/include - LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270 + PW3270_LIBS="-L../../../.bin/Release@DLLDIR@ -lpw3270" + PW3270_CFLAGS="-I../../../src/include" + LIB3270_LIBS="-L../../../.bin/Release@DLLDIR@ -l3270" LIB270_CFLAGS=-I../../../src/include endif ifeq ($(LIB3270_MODE),Default) LIB3270_LIBS ?= `pkg-config --libs lib3270` LIB3270_CFLAGS ?= `pkg-config --cflags lib3270` - PW3270_LIBS ?= `pkg-config --libs pw3270` - PW3270_CFLAGS ?= `pkg-config --cflags pw3270` + PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270` + PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270` endif - #---[ Rules ]------------------------------------------------------------------ $(OBJDBG)/%.o: %.c $(DEPENDS) @@ -110,7 +121,7 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS) + $(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS) #---[ Debug targets ]---------------------------------------------------------- @@ -123,6 +134,10 @@ $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $ #---[ Misc targets ]----------------------------------------------------------- +install: $(BINRLS)/plugins/$(MODULE_NAME).so + @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/plugins + @$(INSTALL_PROGRAM) $(BINRLS)/plugins/$(MODULE_NAME).so $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/plugins + debug-service: $(BINDBG)/@PACKAGE_NAME@d dbus-glue.h: pw3270dbus.xml diff --git a/src/plugins/dbus3270/gobject.c b/src/plugins/dbus3270/gobject.c index 8716a86..a0e53fe 100644 --- a/src/plugins/dbus3270/gobject.c +++ b/src/plugins/dbus3270/gobject.c @@ -214,3 +214,34 @@ void pw3270_dbus_set_text_at(PW3270Dbus *object, int row, int col, const gchar * g_free(text); } + +void pw3270_dbus_get_text_at(PW3270Dbus *object, int row, int col, int len, DBusGMethodInvocation *context) +{ + gchar * text; + H3270 * hSession = pw3270_dbus_get_session_handle(object); + + trace("%s object=%p context=%p",__FUNCTION__,object,context); + if(pw3270_dbus_check_valid_state(object,context)) + return; + + text = lib3270_get_text_at(hSession, row, col, len); + if(!text) + { + GError *error = pw3270_dbus_get_error_from_errno(errno); + dbus_g_method_return_error(context,error); + g_error_free(error); + } + else + { + gchar * utftext = g_convert_with_fallback(text,-1,"UTF-8",lib3270_get_charset(hSession),"?",NULL,NULL,NULL); + + lib3270_free(text); + + dbus_g_method_return(context,utftext); + + g_free(utftext); + } + + +} + diff --git a/src/plugins/dbus3270/pw3270dbus.xml b/src/plugins/dbus3270/pw3270dbus.xml index 98cb55e..0e7e0bd 100644 --- a/src/plugins/dbus3270/pw3270dbus.xml +++ b/src/plugins/dbus3270/pw3270dbus.xml @@ -36,5 +36,11 @@ + + + + + + diff --git a/src/plugins/dbus3270/service.h b/src/plugins/dbus3270/service.h index 8c42d18..44242ea 100644 --- a/src/plugins/dbus3270/service.h +++ b/src/plugins/dbus3270/service.h @@ -75,7 +75,7 @@ // Actions void pw3270_dbus_enter(PW3270Dbus *object, DBusGMethodInvocation *context); void pw3270_dbus_set_text_at(PW3270Dbus *object, int row, int col, const gchar *text, DBusGMethodInvocation *context); - + void pw3270_dbus_get_text_at(PW3270Dbus *object, int row, int col, int len, DBusGMethodInvocation *context); G_END_DECLS diff --git a/src/plugins/rx3270/Makefile.in b/src/plugins/rx3270/Makefile.in index bd1b8b1..dc639ec 100644 --- a/src/plugins/rx3270/Makefile.in +++ b/src/plugins/rx3270/Makefile.in @@ -60,10 +60,11 @@ $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) + $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) + $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) +install: diff --git a/src/pw3270/uiparser/keypad.c b/src/pw3270/uiparser/keypad.c index 473905c..d40c395 100644 --- a/src/pw3270/uiparser/keypad.c +++ b/src/pw3270/uiparser/keypad.c @@ -57,7 +57,7 @@ for(f = 0; f < G_N_ELEMENTS(cmd); f++) { - if(!g_strcasecmp(cmd[f].element_name,element_name)) + if(!g_ascii_strcasecmp(cmd[f].element_name,element_name)) { cmd[f].start(context,names,values,error,keypad); return; diff --git a/src/pw3270/uiparser/parsefile.c b/src/pw3270/uiparser/parsefile.c index 7dccb4e..4c78bca 100644 --- a/src/pw3270/uiparser/parsefile.c +++ b/src/pw3270/uiparser/parsefile.c @@ -187,7 +187,7 @@ for(f=0;info->disabled && plat[f];f++) { - if(!g_strcasecmp(plat[f],platname)) + if(!g_ascii_strcasecmp(plat[f],platname)) info->disabled = 0; } -- libgit2 0.21.2