Download as
Browse Code »

Commit 4ee3a9c71bcdab171f6084d7d8a3866686314235

Authored by Perry Werneck
1 parent fddd6f07
Exists in master and in 1 other branch develop

Updating lib3270 methods.

Showing 4 changed files with 4 additions and 18 deletions   Show diff stats
src/terminal/blink.c
  Diff comments   View file @4ee3a9c
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 rc = TRUE; 46 rc = TRUE;
47 } 47 }
48 48
49 - if(lib3270_get_secure(widget->host) == LIB3270_SSL_NEGOTIATING) 49 + if(lib3270_get_ssl_state(widget->host) == LIB3270_SSL_NEGOTIATING)
50 { 50 {
51 GdkRectangle * r; 51 GdkRectangle * r;
52 cairo_t * cr = v3270_oia_set_update_region(widget,&r,V3270_OIA_SSL); 52 cairo_t * cr = v3270_oia_set_update_region(widget,&r,V3270_OIA_SSL);
@@ -58,16 +58,6 @@ @@ -58,16 +58,6 @@
58 rc = TRUE; 58 rc = TRUE;
59 } 59 }
60 60
61 - /*  
62 - if(!widget->script.id)  
63 - return FALSE;  
64 -  
65 - update_text_field(widget,1,V3270_OIA_SCRIPT,widget->script.blink ? 'S' : ' ');  
66 - widget->script.blink = !widget->script.blink;  
67 -  
68 - return TRUE;  
69 - */  
70 -  
71 return rc; 61 return rc;
72 62
73 } 63 }
src/terminal/callbacks.c
  Diff comments   View file @4ee3a9c
@@ -386,11 +386,9 @@ static void popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title @@ -386,11 +386,9 @@ static void popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title
386 386
387 static gboolean bg_update_ssl(H3270 *session) 387 static gboolean bg_update_ssl(H3270 *session)
388 { 388 {
389 -// trace("%s(%p,%p)",__FUNCTION__,session,lib3270_get_user_data(session));  
390 -  
391 v3270_blink_ssl(GTK_V3270(lib3270_get_user_data(session))); 389 v3270_blink_ssl(GTK_V3270(lib3270_get_user_data(session)));
392 390
393 - if(lib3270_get_secure(session) == LIB3270_SSL_NEGOTIATING) 391 + if(lib3270_get_ssl_state(session) == LIB3270_SSL_NEGOTIATING)
394 v3270_start_blinking(GTK_WIDGET(lib3270_get_user_data(session))); 392 v3270_start_blinking(GTK_WIDGET(lib3270_get_user_data(session)));
395 393
396 return FALSE; 394 return FALSE;
src/terminal/mouse.c
  Diff comments   View file @4ee3a9c
@@ -269,7 +269,7 @@ gboolean v3270_motion_notify_event(GtkWidget *widget, GdkEventMotion *event) @@ -269,7 +269,7 @@ gboolean v3270_motion_notify_event(GtkWidget *widget, GdkEventMotion *event)
269 269
270 if(event->x >= terminal->oia.rect[V3270_OIA_SSL].x && event->x <= (terminal->oia.rect[V3270_OIA_SSL].x + terminal->oia.rect[V3270_OIA_SSL].width)) 270 if(event->x >= terminal->oia.rect[V3270_OIA_SSL].x && event->x <= (terminal->oia.rect[V3270_OIA_SSL].x + terminal->oia.rect[V3270_OIA_SSL].width))
271 { 271 {
272 - switch(lib3270_get_secure(terminal->host)) 272 + switch(lib3270_get_ssl_state(terminal->host))
273 { 273 {
274 case LIB3270_SSL_UNSECURE: /**< No secure connection */ 274 case LIB3270_SSL_UNSECURE: /**< No secure connection */
275 id = LIB3270_POINTER_QUESTION; 275 id = LIB3270_POINTER_QUESTION;
src/terminal/oia.c
  Diff comments   View file @4ee3a9c
@@ -347,15 +347,13 @@ static void draw_xbm(cairo_t *cr, GdkRectangle *rect, int width, int height, uns @@ -347,15 +347,13 @@ static void draw_xbm(cairo_t *cr, GdkRectangle *rect, int width, int height, uns
347 347
348 void v3270_draw_ssl_status(v3270 *widget, cairo_t *cr, GdkRectangle *rect) 348 void v3270_draw_ssl_status(v3270 *widget, cairo_t *cr, GdkRectangle *rect)
349 { 349 {
350 - // v3270_draw_ssl_status(cr,terminal->host,&terminal->font,terminal->color,r);  
351 -  
352 gdk_cairo_set_source_rgba(cr,widget->color+V3270_COLOR_OIA_BACKGROUND); 350 gdk_cairo_set_source_rgba(cr,widget->color+V3270_COLOR_OIA_BACKGROUND);
353 351
354 cairo_translate(cr, rect->x, rect->y); 352 cairo_translate(cr, rect->x, rect->y);
355 cairo_rectangle(cr, 0, 0, rect->width, rect->height); 353 cairo_rectangle(cr, 0, 0, rect->width, rect->height);
356 cairo_fill(cr); 354 cairo_fill(cr);
357 355
358 - switch(lib3270_get_secure(widget->host)) 356 + switch(lib3270_get_ssl_state(widget->host))
359 { 357 {
360 case LIB3270_SSL_UNDEFINED: // Undefined. 358 case LIB3270_SSL_UNDEFINED: // Undefined.
361 break; 359 break;