Download as
Browse Code »

Commit 2be801ec96f6c2ee0a64bfa5e08829a73425db65

Authored by perry.werneck@gmail.com
1 parent 08f3ff7d
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Aparentemente todos os módulos "encaixaram"

Showing 7 changed files with 17 additions and 17 deletions   Show diff stats
@@ -45,7 +45,6 @@ localedir=@localedir@ @@ -45,7 +45,6 @@ localedir=@localedir@
45 docdir=@docdir@ 45 docdir=@docdir@
46 sysconfdir=@sysconfdir@ 46 sysconfdir=@sysconfdir@
47 47
48 -OBJDIR=.obj  
49 BINDIR=.bin 48 BINDIR=.bin
50 49
51 DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270 50 DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270
@@ -60,17 +59,17 @@ MKDIR=@MKDIR_P@ @@ -60,17 +59,17 @@ MKDIR=@MKDIR_P@
60 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 59 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
61 60
62 $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) 61 $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
63 - @$(MAKE) ROOTDIR="../.." LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 62 + @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
64 63
65 $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile 64 $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
66 - @$(MAKE) ROOTDIR="../.." BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@ 65 + @$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@
67 66
68 #---[ Targets ]---------------------------------------------------------------- 67 #---[ Targets ]----------------------------------------------------------------
69 68
70 69
71 clean: 70 clean:
72 - @rm -fr $(OBJDIR)  
73 - @rm -fr $(BINDIR) 71 + @rm -fr .obj
  72 + @rm -fr .bin
74 @make -C src/lib3270 clean 73 @make -C src/lib3270 clean
75 @make -C src/gtk clean 74 @make -C src/gtk clean
76 75
src/gtk/v3270/iocallback.c
  Diff comments   View file @2be801e
@@ -256,10 +256,10 @@ struct bgParameter @@ -256,10 +256,10 @@ struct bgParameter
256 256
257 gpointer BgCall(struct bgParameter *p) 257 gpointer BgCall(struct bgParameter *p)
258 { 258 {
259 - Trace("%s starts",__FUNCTION__); 259 + trace("%s starts",__FUNCTION__);
260 p->rc = p->callback(p->session, p->parm); 260 p->rc = p->callback(p->session, p->parm);
261 p->running = FALSE; 261 p->running = FALSE;
262 - Trace("%s ends",__FUNCTION__); 262 + trace("%s ends",__FUNCTION__);
263 return 0; 263 return 0;
264 } 264 }
265 265
@@ -268,7 +268,7 @@ static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *ses @@ -268,7 +268,7 @@ static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *ses
268 struct bgParameter p = { TRUE, session, -1, callback, parm }; 268 struct bgParameter p = { TRUE, session, -1, callback, parm };
269 GThread *thread; 269 GThread *thread;
270 270
271 - Trace("Starting auxiliary thread for callback %p",callback); 271 + trace("Starting auxiliary thread for callback %p",callback);
272 272
273 p.running = TRUE; 273 p.running = TRUE;
274 thread = g_thread_create( (GThreadFunc) BgCall, &p, 0, NULL); 274 thread = g_thread_create( (GThreadFunc) BgCall, &p, 0, NULL);
src/gtk/v3270/widget.c
  Diff comments   View file @2be801e
@@ -391,7 +391,7 @@ static void update_model(H3270 *session, const char *name, int model, int rows, @@ -391,7 +391,7 @@ static void update_model(H3270 *session, const char *name, int model, int rows,
391 static void v3270_init(v3270 *widget) 391 static void v3270_init(v3270 *widget)
392 { 392 {
393 trace("%s",__FUNCTION__); 393 trace("%s",__FUNCTION__);
394 - widget->host = new_3270_session(""); 394 + widget->host = lib3270_session_new("");
395 widget->host->widget = widget; 395 widget->host->widget = widget;
396 396
397 widget->host->update = v3270_update_char; 397 widget->host->update = v3270_update_char;
src/include/lib3270.h
  Diff comments   View file @2be801e
@@ -576,6 +576,9 @@ @@ -576,6 +576,9 @@
576 */ 576 */
577 LIB3270_EXPORT void * lib3270_get_widget(H3270 *h); 577 LIB3270_EXPORT void * lib3270_get_widget(H3270 *h);
578 578
  579 + LIB3270_EXPORT int lib3270_set_model(H3270 *session, int model);
  580 + LIB3270_EXPORT int lib3270_get_model(H3270 *session);
  581 +
579 #ifdef __cplusplus 582 #ifdef __cplusplus
580 } 583 }
581 #endif 584 #endif
src/lib3270/XtGlue.c
  Diff comments   View file @2be801e
@@ -581,8 +581,7 @@ Realloc(void *p, size_t len) @@ -581,8 +581,7 @@ Realloc(void *p, size_t len)
581 return p; 581 return p;
582 } 582 }
583 583
584 -void  
585 -Free(void *p) 584 +void Free(void *p)
586 { 585 {
587 if (p != NULL) 586 if (p != NULL)
588 free(p); 587 free(p);
src/lib3270/api.h
  Diff comments   View file @2be801e
@@ -429,9 +429,6 @@ @@ -429,9 +429,6 @@
429 #define set_3270_model(h,m) lib3270_set_model(h,m) 429 #define set_3270_model(h,m) lib3270_set_model(h,m)
430 #define get_3270_model(h) lib3270_get_model(h) 430 #define get_3270_model(h) lib3270_get_model(h)
431 431
432 - LOCAL_EXTERN int lib3270_set_model(H3270 *session, int model);  
433 - LOCAL_EXTERN int lib3270_get_model(H3270 *session);  
434 -  
435 /* Get connection info */ 432 /* Get connection info */
436 #define get_connected_lu(h) lib3270_get_luname(h) 433 #define get_connected_lu(h) lib3270_get_luname(h)
437 #define get_current_host(h) lib3270_get_host(h) 434 #define get_current_host(h) lib3270_get_host(h)
src/lib3270/glue.c
  Diff comments   View file @2be801e
@@ -419,10 +419,12 @@ static void initialize(void) @@ -419,10 +419,12 @@ static void initialize(void)
419 appres.highlight_underline = True; 419 appres.highlight_underline = True;
420 #endif /*]*/ 420 #endif /*]*/
421 421
422 -#if defined(C3270) && !defined(_WIN32) && !defined(LIB3270) /*[*/  
423 - /* Merge in the profile. */ 422 +/*
  423 +#if defined(C3270) && !defined(_WIN32) && !defined(LIB3270)
  424 + // Merge in the profile.
424 merge_profile(); 425 merge_profile();
425 -#endif /*]*/ 426 +#endif
  427 +*/
426 428
427 } 429 }
428 430