diff --git a/Makefile.in b/Makefile.in index 5814473..e219a62 100644 --- a/Makefile.in +++ b/Makefile.in @@ -262,12 +262,12 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist install: install-sdk install-lib install-app install-man -install-app: install-locale +install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale @$(MAKE) DESTDIR=$(DESTDIR) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui -install-lib: +install-lib: $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ @$(MAKE) DESTDIR=$(DESTDIR) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) diff --git a/po/pt_BR.po b/po/pt_BR.po index 934b545..a30bee0 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: 2012-09-13 13:47-0300\n" +"POT-Creation-Date: 2012-09-13 15:45-0300\n" "PO-Revision-Date: 2012-09-05 09:05-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português do Brasil <>\n" diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index 192295d..c2ccf2b 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -55,8 +55,8 @@ LD=@CC@ HOST_CC=@HOST_CC@ STRIP=@STRIP@ INSTALL=@INSTALL@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -INSTALL_DATA=@INSTALL_DATA@ +INSTALL_PROGRAM=$(INSTALL) -m 755 +INSTALL_DATA=$(INSTALL) -m 644 VALGRIND=@VALGRIND@ XGETTEXT=@XGETTEXT@ MSGCAT=@MSGCAT@ diff --git a/src/lib3270/rpq.c b/src/lib3270/rpq.c index b0800a7..5b57d93 100644 --- a/src/lib3270/rpq.c +++ b/src/lib3270/rpq.c @@ -746,7 +746,7 @@ static void rpq_dump_warnings(H3270 *hSession) /* If there's something to complain about, only complain once. */ if (!hSession->rpq_complained && hSession->rpq_wbcnt) { - popup_an_error(hSession,hSession->rpq_warnbuf); + popup_an_error(hSession,"%s",hSession->rpq_warnbuf); hSession->rpq_wbcnt = 0; hSession->rpq_complained = 1; diff --git a/src/lib3270/session.c b/src/lib3270/session.c index 1ba726f..765ee8b 100644 --- a/src/lib3270/session.c +++ b/src/lib3270/session.c @@ -145,9 +145,9 @@ static void message(H3270 *session, LIB3270_NOTIFY id , const char *title, const __android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",msg); __android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",text); #else - lib3270_write_log(session,"%s",title); - lib3270_write_log(session,"%s",msg); - lib3270_write_log(session,"%s",text); + lib3270_write_log(session,"lib3270","%s",title); + lib3270_write_log(session,"lib3270","%s",msg); + lib3270_write_log(session,"lib3270","%s",text); #endif // ANDROID } diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c index 0a022e6..2b6cbd3 100644 --- a/src/lib3270/telnet.c +++ b/src/lib3270/telnet.c @@ -616,7 +616,7 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo { if (resolve_host_and_port(session,session->proxy_host, session->proxy_portname,&session->proxy_port, &haddr.sa, &ha_len, errmsg,sizeof(errmsg)) < 0) { - popup_an_error(session,errmsg); + popup_an_error(session,"%s",errmsg); return -1; } } @@ -624,7 +624,7 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo { if (resolve_host_and_port(session,host, portname,&session->current_port, &haddr.sa, &ha_len,errmsg, sizeof(errmsg)) < 0) { - popup_an_error(session,errmsg); + popup_an_error(session,"%s",errmsg); return -1; } } diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 37bcd4c..7cbd625 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -42,8 +42,8 @@ DEBDIR ?= debian EXEEXT=@EXEEXT@ STRIP=@STRIP@ INSTALL=@INSTALL@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -INSTALL_DATA=@INSTALL_DATA@ +INSTALL_PROGRAM=$(INSTALL) -m 755 +INSTALL_DATA=$(INSTALL) -m 644 CONVERT=@CONVERT@ LN_S=@LN_S@ -- libgit2 0.21.2