Download as
Browse Code »

Commit 26cbd9c4db82b1955ad48e14667588f32da40c20

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

Revertendo uso de g_action; precisa de mais ajustes

Showing 3 changed files with 8 additions and 7 deletions   Show diff stats
src/plugins/rx3270/pluginmain.cc
  Diff comments   View file @26cbd9c
@@ -403,11 +403,7 @@ extern "C" @@ -403,11 +403,7 @@ extern "C"
403 { 403 {
404 gchar *filename = (gchar *) g_object_get_data(G_OBJECT(action),"src"); 404 gchar *filename = (gchar *) g_object_get_data(G_OBJECT(action),"src");
405 405
406 -#if GTK_CHECK_VERSION(3,10,0)  
407 - lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p",g_action_get_name(G_ACTION(action)),widget);  
408 -#else  
409 lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p",gtk_action_get_name(action),widget); 406 lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p",gtk_action_get_name(action),widget);
410 -#endif // GTK_CHECK_VERSION  
411 407
412 #if GTK_CHECK_VERSION(2,32,0) 408 #if GTK_CHECK_VERSION(2,32,0)
413 if(!g_mutex_trylock(&mutex)) 409 if(!g_mutex_trylock(&mutex))
src/pw3270/actions.c
  Diff comments   View file @26cbd9c
@@ -47,7 +47,8 @@ @@ -47,7 +47,8 @@
47 #define ERROR_DOMAIN g_quark_from_static_string(PACKAGE_NAME) 47 #define ERROR_DOMAIN g_quark_from_static_string(PACKAGE_NAME)
48 #define TOGGLE_GDKDEBUG LIB3270_TOGGLE_COUNT+1 48 #define TOGGLE_GDKDEBUG LIB3270_TOGGLE_COUNT+1
49 49
50 - #ifdef X3270_TRACE 50 +
  51 + #if defined(X3270_TRACE)
51 #define trace_action(a,w) lib3270_trace_event(v3270_get_session(w),"Action %s activated on widget %p\n",gtk_action_get_name(a),w); 52 #define trace_action(a,w) lib3270_trace_event(v3270_get_session(w),"Action %s activated on widget %p\n",gtk_action_get_name(a),w);
52 #else 53 #else
53 #define trace_action(a,w) /* */ 54 #define trace_action(a,w) /* */
@@ -371,13 +372,16 @@ static void connect_move_action(GtkAction *action, GtkWidget *widget, const gcha @@ -371,13 +372,16 @@ static void connect_move_action(GtkAction *action, GtkWidget *widget, const gcha
371 static void action_pfkey(GtkAction *action, GtkWidget *widget) 372 static void action_pfkey(GtkAction *action, GtkWidget *widget)
372 { 373 {
373 int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pfkey")); 374 int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pfkey"));
  375 +
374 lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key); 376 lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key);
  377 +
375 lib3270_pfkey(v3270_get_session(widget),key); 378 lib3270_pfkey(v3270_get_session(widget),key);
376 } 379 }
377 380
378 static void action_pakey(GtkAction *action, GtkWidget *widget) 381 static void action_pakey(GtkAction *action, GtkWidget *widget)
379 { 382 {
380 int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pakey")); 383 int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pakey"));
  384 +
381 lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key); 385 lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key);
382 lib3270_pakey(v3270_get_session(widget),key); 386 lib3270_pakey(v3270_get_session(widget),key);
383 } 387 }
@@ -385,6 +389,7 @@ static void action_pakey(GtkAction *action, GtkWidget *widget) @@ -385,6 +389,7 @@ static void action_pakey(GtkAction *action, GtkWidget *widget)
385 static void action_set_toggle(GtkAction *action, GtkWidget *widget) 389 static void action_set_toggle(GtkAction *action, GtkWidget *widget)
386 { 390 {
387 LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id")); 391 LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
  392 +
388 lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id); 393 lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
389 lib3270_set_toggle(v3270_get_session(widget),id,1); 394 lib3270_set_toggle(v3270_get_session(widget),id,1);
390 } 395 }
@@ -398,7 +403,7 @@ static void action_reset_toggle(GtkAction *action, GtkWidget *widget) @@ -398,7 +403,7 @@ static void action_reset_toggle(GtkAction *action, GtkWidget *widget)
398 403
399 static void action_select_all(GtkAction *action, GtkWidget *widget) 404 static void action_select_all(GtkAction *action, GtkWidget *widget)
400 { 405 {
401 - lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p\n",gtk_action_get_name(action),widget); 406 + trace_action(action,widget);
402 lib3270_select_all(v3270_get_session(widget)); 407 lib3270_select_all(v3270_get_session(widget));
403 } 408 }
404 409
src/pw3270/ft/ftdialog.c
  Diff comments   View file @26cbd9c
@@ -357,7 +357,7 @@ GtkWidget * v3270_ft_dialog_new(GtkWidget *parent, LIB3270_FT_OPTION options) @@ -357,7 +357,7 @@ GtkWidget * v3270_ft_dialog_new(GtkWidget *parent, LIB3270_FT_OPTION options)
357 gtk_dialog_add_button(GTK_DIALOG(dialog),_( "_Cancel" ), GTK_RESPONSE_CANCEL); 357 gtk_dialog_add_button(GTK_DIALOG(dialog),_( "_Cancel" ), GTK_RESPONSE_CANCEL);
358 358
359 dialog->ready = gtk_dialog_add_button(GTK_DIALOG(dialog), 359 dialog->ready = gtk_dialog_add_button(GTK_DIALOG(dialog),
360 - (dialog->options & LIB3270_FT_OPTION_RECEIVE) != 0 ? _( "_Send") : _( "_Save" ), 360 + (dialog->options & LIB3270_FT_OPTION_RECEIVE) != 0 ? _( "_Save") : _( "_Send" ),
361 GTK_RESPONSE_ACCEPT); 361 GTK_RESPONSE_ACCEPT);
362 362
363 gtk_widget_set_sensitive(dialog->ready,FALSE); 363 gtk_widget_set_sensitive(dialog->ready,FALSE);