From d03a33524fffd0008389039dbf125ab3d3a5fe20 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 14 Feb 2020 15:44:07 -0300 Subject: [PATCH] Fixing actions. --- src/terminal/actions/action.c | 2 +- src/terminal/actions/property.c | 2 -- src/terminal/actions/simple.c | 15 ++++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/terminal/actions/action.c b/src/terminal/actions/action.c index 4d8f4d9..a099407 100644 --- a/src/terminal/actions/action.c +++ b/src/terminal/actions/action.c @@ -246,7 +246,7 @@ } static gboolean bg_notify_enabled(GObject *action) { - debug("%s(%s,%s)",__FUNCTION__,g_action_get_name(G_ACTION(action)),(g_action_get_enabled(G_ACTION(action)) ? "enabled" : "disabled")); + debug("%s(%s,%s,%d)",__FUNCTION__,g_action_get_name(G_ACTION(action)),(g_action_get_enabled(G_ACTION(action)) ? "enabled" : "disabled"),(int) v3270_action_get_group(G_ACTION(action))); g_object_notify(action, "enabled"); return FALSE; } diff --git a/src/terminal/actions/property.c b/src/terminal/actions/property.c index 5312bb5..091cdff 100644 --- a/src/terminal/actions/property.c +++ b/src/terminal/actions/property.c @@ -75,7 +75,6 @@ static void change_widget(GAction *object, GtkWidget *from, GtkWidget *to); static void activate(GAction *object, GVariant *parameter, GtkWidget *terminal); - G_DEFINE_TYPE(v3270PropertyAction, v3270PropertyAction, V3270_TYPE_SIMPLE_ACTION); void v3270PropertyAction_class_init(v3270PropertyActionClass *klass) { @@ -243,7 +242,6 @@ if(lProperty) { action->parent.label = lib3270_property_get_label(lProperty); action->parent.tooltip = lib3270_property_get_summary(lProperty); -// action->group.id = lProperty->group; } if(!action->parent.tooltip) diff --git a/src/terminal/actions/simple.c b/src/terminal/actions/simple.c index a8b51ff..8b2ee79 100644 --- a/src/terminal/actions/simple.c +++ b/src/terminal/actions/simple.c @@ -57,6 +57,10 @@ return V3270_SIMPLE_ACTION(action)->name; } + static LIB3270_ACTION_GROUP get_action_group(GAction *action) { + return V3270_SIMPLE_ACTION(action)->group.id; + } + static void dispose(GObject *object) { V3270SimpleAction *action = V3270_SIMPLE_ACTION(object); @@ -75,11 +79,12 @@ static void V3270SimpleAction_class_init(V3270SimpleActionClass *klass) { - klass->parent_class.get_name = get_name; - klass->parent_class.get_icon_name = get_icon_name; - klass->parent_class.get_label = get_label; - klass->parent_class.get_tooltip = get_tooltip; - klass->parent_class.activate = klass_activate; + klass->parent_class.get_name = get_name; + klass->parent_class.get_icon_name = get_icon_name; + klass->parent_class.get_label = get_label; + klass->parent_class.get_tooltip = get_tooltip; + klass->parent_class.activate = klass_activate; + klass->parent_class.get_action_group = get_action_group; G_OBJECT_CLASS(klass)->dispose = dispose; -- libgit2 0.21.2