From 2be801ec96f6c2ee0a64bfa5e08829a73425db65 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 6 Mar 2012 19:08:08 +0000
Subject: [PATCH] Aparentemente todos os módulos "encaixaram"

---
 Makefile.in                |  9 ++++-----
 src/gtk/v3270/iocallback.c |  6 +++---
 src/gtk/v3270/widget.c     |  2 +-
 src/include/lib3270.h      |  3 +++
 src/lib3270/XtGlue.c       |  3 +--
 src/lib3270/api.h          |  3 ---
 src/lib3270/glue.c         |  8 +++++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index adb7a0a..48ad04b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,7 +45,6 @@ localedir=@localedir@
 docdir=@docdir@
 sysconfdir=@sysconfdir@
 
-OBJDIR=.obj
 BINDIR=.bin
 
 DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270
@@ -60,17 +59,17 @@ MKDIR=@MKDIR_P@
 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
 
 $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
-	@$(MAKE) ROOTDIR="../.." LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
+	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
 
 $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
-	@$(MAKE) ROOTDIR="../.." BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@
+	@$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@
 
 #---[ Targets ]----------------------------------------------------------------
 
 
 clean:
-	@rm -fr $(OBJDIR)
-	@rm -fr $(BINDIR)
+	@rm -fr .obj
+	@rm -fr .bin
 	@make -C src/lib3270 clean
 	@make -C src/gtk clean
 
diff --git a/src/gtk/v3270/iocallback.c b/src/gtk/v3270/iocallback.c
index dc39b6e..f7dfb68 100644
--- a/src/gtk/v3270/iocallback.c
+++ b/src/gtk/v3270/iocallback.c
@@ -256,10 +256,10 @@ struct bgParameter
 
 gpointer BgCall(struct bgParameter *p)
 {
-	Trace("%s starts",__FUNCTION__);
+	trace("%s starts",__FUNCTION__);
 	p->rc = p->callback(p->session, p->parm);
 	p->running = FALSE;
-	Trace("%s ends",__FUNCTION__);
+	trace("%s ends",__FUNCTION__);
 	return 0;
 }
 
@@ -268,7 +268,7 @@ static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *ses
 	struct bgParameter p = { TRUE, session, -1, callback, parm };
 	GThread	*thread;
 
-	Trace("Starting auxiliary thread for callback %p",callback);
+	trace("Starting auxiliary thread for callback %p",callback);
 
 	p.running = TRUE;
     thread = g_thread_create( (GThreadFunc) BgCall, &p, 0, NULL);
diff --git a/src/gtk/v3270/widget.c b/src/gtk/v3270/widget.c
index 5745021..bab4fc8 100644
--- a/src/gtk/v3270/widget.c
+++ b/src/gtk/v3270/widget.c
@@ -391,7 +391,7 @@ static void update_model(H3270 *session, const char *name, int model, int rows, 
 static void v3270_init(v3270 *widget)
 {
 	trace("%s",__FUNCTION__);
-	widget->host = new_3270_session("");
+	widget->host = lib3270_session_new("");
 	widget->host->widget = widget;
 
 	widget->host->update			= v3270_update_char;
diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index 3248646..c261e5e 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -576,6 +576,9 @@
 	 */
 	 LIB3270_EXPORT void * lib3270_get_widget(H3270 *h);
 
+	 LIB3270_EXPORT int lib3270_set_model(H3270 *session, int model);
+	 LIB3270_EXPORT int	lib3270_get_model(H3270 *session);
+
 #ifdef __cplusplus
 	}
 #endif
diff --git a/src/lib3270/XtGlue.c b/src/lib3270/XtGlue.c
index ecdf917..e0abcc2 100644
--- a/src/lib3270/XtGlue.c
+++ b/src/lib3270/XtGlue.c
@@ -581,8 +581,7 @@ Realloc(void *p, size_t len)
 	return p;
 }
 
-void
-Free(void *p)
+void Free(void *p)
 {
 	if (p != NULL)
 		free(p);
diff --git a/src/lib3270/api.h b/src/lib3270/api.h
index 35fa4e0..c0848b5 100644
--- a/src/lib3270/api.h
+++ b/src/lib3270/api.h
@@ -429,9 +429,6 @@
 		#define set_3270_model(h,m)	lib3270_set_model(h,m)
 		#define get_3270_model(h) lib3270_get_model(h)
 
-		LOCAL_EXTERN int			  lib3270_set_model(H3270 *session, int model);
-		LOCAL_EXTERN int			  lib3270_get_model(H3270 *session);
-
 		/* Get connection info */
 		#define get_connected_lu(h) lib3270_get_luname(h)
 		#define get_current_host(h) lib3270_get_host(h)
diff --git a/src/lib3270/glue.c b/src/lib3270/glue.c
index 23ad534..6db47d7 100644
--- a/src/lib3270/glue.c
+++ b/src/lib3270/glue.c
@@ -419,10 +419,12 @@ static void initialize(void)
 	appres.highlight_underline = True;
 #endif /*]*/
 
-#if defined(C3270) && !defined(_WIN32) && !defined(LIB3270) /*[*/
-	/* Merge in the profile. */
+/*
+#if defined(C3270) && !defined(_WIN32) && !defined(LIB3270)
+	// Merge in the profile.
 	merge_profile();
-#endif /*]*/
+#endif
+*/
 
 }
 
--
libgit2 0.21.2