AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkActionHelper: Allow a NULL action-name to unset the previous GAction

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=783587
This commit is contained in:
Debarshi Ray 2017-06-09 12:15:53 +02:00
parent 1e47b9ea67
commit 33b3985440
1 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
gtk/gtkactionhelper.c
View File

@ -41,7 +41,8 @@ static void gtk_action_helper_action_added (GtkActi
GVariant *state, GVariant *state,
gboolean should_emit_signals); gboolean should_emit_signals);
static void gtk_action_helper_action_removed (GtkActionHelper *helper); static void gtk_action_helper_action_removed (GtkActionHelper *helper,
gboolean should_emit_signals);
static void gtk_action_helper_action_enabled_changed (GtkActionHelper *helper, static void gtk_action_helper_action_enabled_changed (GtkActionHelper *helper,
gboolean enabled); gboolean enabled);
@ -190,7 +191,8 @@ gtk_action_helper_action_added (GtkActionHelper *helper,
} }
static void static void
gtk_action_helper_action_removed (GtkActionHelper *helper) gtk_action_helper_action_removed (GtkActionHelper *helper,
gboolean should_emit_signals)
{ {
GTK_NOTE(ACTIONS, g_message ("%s: action %s was removed", "actionhelper", helper->action_name)); GTK_NOTE(ACTIONS, g_message ("%s: action %s was removed", "actionhelper", helper->action_name));
@ -202,13 +204,17 @@ gtk_action_helper_action_removed (GtkActionHelper *helper)
if (helper->enabled) if (helper->enabled)
{ {
helper->enabled = FALSE; helper->enabled = FALSE;
gtk_action_helper_report_change (helper, PROP_ENABLED);
if (should_emit_signals)
gtk_action_helper_report_change (helper, PROP_ENABLED);
} }
if (helper->active) if (helper->active)
{ {
helper->active = FALSE; helper->active = FALSE;
gtk_action_helper_report_change (helper, PROP_ACTIVE);
if (should_emit_signals)
gtk_action_helper_report_change (helper, PROP_ACTIVE);
} }
} }
@ -327,7 +333,7 @@ gtk_action_helper_observer_action_removed (GtkActionObserver *observer,
GtkActionObservable *observable, GtkActionObservable *observable,
const gchar *action_name) const gchar *action_name)
{ {
gtk_action_helper_action_removed (GTK_ACTION_HELPER (observer)); gtk_action_helper_action_removed (GTK_ACTION_HELPER (observer), TRUE);
} }
static void static void
@ -421,40 +427,44 @@ gtk_action_helper_set_action_name (GtkActionHelper *helper,
"it is unlikely to work", "it is unlikely to work",
"actionhelper", action_name)); "actionhelper", action_name));
if (helper->action_name)
{
gtk_action_observable_unregister_observer (GTK_ACTION_OBSERVABLE (helper->action_context),
helper->action_name,
GTK_ACTION_OBSERVER (helper));
g_free (helper->action_name);
}
helper->action_name = g_strdup (action_name);
gtk_action_observable_register_observer (GTK_ACTION_OBSERVABLE (helper->action_context),
helper->action_name,
GTK_ACTION_OBSERVER (helper));
/* Start by recording the current state of our properties so we know /* Start by recording the current state of our properties so we know
* what notify signals we will need to send. * what notify signals we will need to send.
*/ */
was_enabled = helper->enabled; was_enabled = helper->enabled;
was_active = helper->active; was_active = helper->active;
if (g_action_group_query_action (G_ACTION_GROUP (helper->action_context), helper->action_name, if (helper->action_name)
&enabled, &parameter_type, NULL, NULL, &state))
{ {
GTK_NOTE(ACTIONS, g_message ("%s: action %s existed from the start", "actionhelper", helper->action_name)); gtk_action_helper_action_removed (helper, FALSE);
gtk_action_observable_unregister_observer (GTK_ACTION_OBSERVABLE (helper->action_context),
gtk_action_helper_action_added (helper, enabled, parameter_type, state, FALSE); helper->action_name,
GTK_ACTION_OBSERVER (helper));
if (state) g_clear_pointer (&helper->action_name, g_free);
g_variant_unref (state);
} }
else
if (action_name)
{ {
GTK_NOTE(ACTIONS, g_message ("%s: action %s missing from the start", "actionhelper", helper->action_name)); helper->action_name = g_strdup (action_name);
helper->enabled = FALSE;
gtk_action_observable_register_observer (GTK_ACTION_OBSERVABLE (helper->action_context),
helper->action_name,
GTK_ACTION_OBSERVER (helper));
if (g_action_group_query_action (G_ACTION_GROUP (helper->action_context), helper->action_name,
&enabled, &parameter_type, NULL, NULL, &state))
{
GTK_NOTE(ACTIONS, g_message ("%s: action %s existed from the start", "actionhelper", helper->action_name));
gtk_action_helper_action_added (helper, enabled, parameter_type, state, FALSE);
if (state)
g_variant_unref (state);
}
else
{
GTK_NOTE(ACTIONS, g_message ("%s: action %s missing from the start", "actionhelper", helper->action_name));
helper->enabled = FALSE;
}
} }
/* Send the notifies for the properties that changed. /* Send the notifies for the properties that changed.