From 26cbd9c4db82b1955ad48e14667588f32da40c20 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Tue, 3 Dec 2013 14:47:02 +0000 Subject: [PATCH] Revertendo uso de g_action; precisa de mais ajustes --- src/plugins/rx3270/pluginmain.cc | 4 ---- src/pw3270/actions.c | 9 +++++++-- src/pw3270/ft/ftdialog.c | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/rx3270/pluginmain.cc b/src/plugins/rx3270/pluginmain.cc index 86b55e2..54b7af3 100644 --- a/src/plugins/rx3270/pluginmain.cc +++ b/src/plugins/rx3270/pluginmain.cc @@ -403,11 +403,7 @@ extern "C" { gchar *filename = (gchar *) g_object_get_data(G_OBJECT(action),"src"); -#if GTK_CHECK_VERSION(3,10,0) - lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p",g_action_get_name(G_ACTION(action)),widget); -#else lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p",gtk_action_get_name(action),widget); -#endif // GTK_CHECK_VERSION #if GTK_CHECK_VERSION(2,32,0) if(!g_mutex_trylock(&mutex)) diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c index 4222729..3e97b02 100644 --- a/src/pw3270/actions.c +++ b/src/pw3270/actions.c @@ -47,7 +47,8 @@ #define ERROR_DOMAIN g_quark_from_static_string(PACKAGE_NAME) #define TOGGLE_GDKDEBUG LIB3270_TOGGLE_COUNT+1 - #ifdef X3270_TRACE + + #if defined(X3270_TRACE) #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); #else #define trace_action(a,w) /* */ @@ -371,13 +372,16 @@ static void connect_move_action(GtkAction *action, GtkWidget *widget, const gcha static void action_pfkey(GtkAction *action, GtkWidget *widget) { int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pfkey")); + lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key); + lib3270_pfkey(v3270_get_session(widget),key); } static void action_pakey(GtkAction *action, GtkWidget *widget) { int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pakey")); + lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key); lib3270_pakey(v3270_get_session(widget),key); } @@ -385,6 +389,7 @@ static void action_pakey(GtkAction *action, GtkWidget *widget) static void action_set_toggle(GtkAction *action, GtkWidget *widget) { LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id")); + lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id); lib3270_set_toggle(v3270_get_session(widget),id,1); } @@ -398,7 +403,7 @@ static void action_reset_toggle(GtkAction *action, GtkWidget *widget) static void action_select_all(GtkAction *action, GtkWidget *widget) { - lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p\n",gtk_action_get_name(action),widget); + trace_action(action,widget); lib3270_select_all(v3270_get_session(widget)); } diff --git a/src/pw3270/ft/ftdialog.c b/src/pw3270/ft/ftdialog.c index c452184..7ca0f78 100644 --- a/src/pw3270/ft/ftdialog.c +++ b/src/pw3270/ft/ftdialog.c @@ -357,7 +357,7 @@ GtkWidget * v3270_ft_dialog_new(GtkWidget *parent, LIB3270_FT_OPTION options) gtk_dialog_add_button(GTK_DIALOG(dialog),_( "_Cancel" ), GTK_RESPONSE_CANCEL); dialog->ready = gtk_dialog_add_button(GTK_DIALOG(dialog), - (dialog->options & LIB3270_FT_OPTION_RECEIVE) != 0 ? _( "_Send") : _( "_Save" ), + (dialog->options & LIB3270_FT_OPTION_RECEIVE) != 0 ? _( "_Save") : _( "_Send" ), GTK_RESPONSE_ACCEPT); gtk_widget_set_sensitive(dialog->ready,FALSE); -- libgit2 0.21.2