Download as
Browse Code »

Commit c879a1b5f96542ca006ef8ad2113fb83bd505f17

Authored by perry.werneck@gmail.com
1 parent 15408549
Exists in master and in 1 other branch develop

Corrigindo incoerências nos diálogos e APIs

Showing 1 changed file with 5 additions and 19 deletions   Show diff stats
@@ -1389,25 +1389,11 @@ H3270 * v3270_get_session(GtkWidget *widget) @@ -1389,25 +1389,11 @@ H3270 * v3270_get_session(GtkWidget *widget)
1389 return GTK_V3270(widget)->host; 1389 return GTK_V3270(widget)->host;
1390 } 1390 }
1391 1391
1392 -int v3270_connect(GtkWidget *widget, const gchar *uri) 1392 +int v3270_connect(GtkWidget *widget)
1393 { 1393 {
1394 - v3270 * terminal;  
1395 - int rc = -1;  
1396 -  
1397 - trace("%s widget=%p host=%p",__FUNCTION__,widget,uri);  
1398 -  
1399 g_return_val_if_fail(GTK_IS_V3270(widget),EINVAL); 1394 g_return_val_if_fail(GTK_IS_V3270(widget),EINVAL);
1400 1395
1401 - terminal = GTK_V3270(widget);  
1402 -  
1403 - if(uri)  
1404 - {  
1405 - trace("%s(%s)",__FUNCTION__,uri);  
1406 - lib3270_set_host(terminal->host,uri);  
1407 - }  
1408 -  
1409 - return lib3270_connect(terminal->host,0);  
1410 - 1396 + return lib3270_connect(GTK_V3270(widget)->host,0);
1411 } 1397 }
1412 1398
1413 static gboolean notify_focus(GtkWidget *widget, GdkEventFocus *event) 1399 static gboolean notify_focus(GtkWidget *widget, GdkEventFocus *event)
@@ -1446,7 +1432,7 @@ static void v3270_activate(GtkWidget *widget) @@ -1446,7 +1432,7 @@ static void v3270_activate(GtkWidget *widget)
1446 if(lib3270_connected(terminal->host)) 1432 if(lib3270_connected(terminal->host))
1447 lib3270_enter(terminal->host); 1433 lib3270_enter(terminal->host);
1448 else if(lib3270_get_hostname(terminal->host)) 1434 else if(lib3270_get_hostname(terminal->host))
1449 - v3270_connect(widget,NULL); 1435 + v3270_connect(widget);
1450 else 1436 else
1451 g_warning("Terminal widget %p activated without connection or valid hostname",terminal); 1437 g_warning("Terminal widget %p activated without connection or valid hostname",terminal);
1452 } 1438 }
@@ -1500,11 +1486,11 @@ gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix) @@ -1500,11 +1486,11 @@ gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
1500 * 1486 *
1501 * Since: 5.0 1487 * Since: 5.0
1502 **/ 1488 **/
1503 -const gchar * v3270_set_host(GtkWidget *widget, const gchar *uri) 1489 +const gchar * v3270_set_url(GtkWidget *widget, const gchar *uri)
1504 { 1490 {
1505 g_return_if_fail(GTK_IS_V3270(widget)); 1491 g_return_if_fail(GTK_IS_V3270(widget));
1506 g_return_if_fail(uri != NULL); 1492 g_return_if_fail(uri != NULL);
1507 - return lib3270_set_host(GTK_V3270(widget)->host,uri); 1493 + return lib3270_set_url(GTK_V3270(widget)->host,uri);
1508 } 1494 }
1509 1495
1510 const gchar * v3270_get_hostname(GtkWidget *widget) 1496 const gchar * v3270_get_hostname(GtkWidget *widget)