diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2013-08-23 21:05:33 +0000 |
---|---|---|
committer | Tarmac <Unknown> | 2013-08-23 21:05:33 +0000 |
commit | ea425561c78ef3bcff0092e2c8db52c85ecb3c86 (patch) | |
tree | 6c2110fbd1ff6cdf1a11bb51c2660328a53a0ec3 /src/service.c | |
parent | 201e9d12d620f256879ea88a4edff4f293169f48 (diff) | |
parent | d8e1189536efa1c190e6ca441927d05a6fda81f3 (diff) | |
download | ayatana-indicator-session-ea425561c78ef3bcff0092e2c8db52c85ecb3c86.tar.gz ayatana-indicator-session-ea425561c78ef3bcff0092e2c8db52c85ecb3c86.tar.bz2 ayatana-indicator-session-ea425561c78ef3bcff0092e2c8db52c85ecb3c86.zip |
use an a{sv}, rather than the obsoleted (sssb), for the root action's state.
Approved by Ted Gould, PS Jenkins bot, Mathieu Trudel-Lapierre.
Diffstat (limited to 'src/service.c')
-rw-r--r-- | src/service.c | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/src/service.c b/src/service.c index 7303fcf..b7b1ba2 100644 --- a/src/service.c +++ b/src/service.c @@ -143,29 +143,28 @@ rebuild_settings_section_soon (IndicatorSessionService * self) **** ***/ -static void -update_header_action (IndicatorSessionService * self) +static GVariant * +action_state_for_header (IndicatorSessionService * self) { - gchar * a11y; + const priv_t * const p = self->priv; gboolean need_attn; + GIcon * icon; gboolean show_name; - GVariant * variant; const gchar * real_name; const gchar * label; - const gchar * iconstr; - const priv_t * const p = self->priv; - - g_return_if_fail (p->header_action != NULL); + gchar * a11y; + GVariantBuilder b; + GVariant * state; if (indicator_session_actions_has_online_account_error (p->backend_actions)) { need_attn = TRUE; - iconstr = ICON_ALERT; + icon = g_themed_icon_new (ICON_ALERT); } else { need_attn = FALSE; - iconstr = ICON_DEFAULT; + icon = g_themed_icon_new (ICON_DEFAULT); } show_name = g_settings_get_boolean (p->indicator_settings, @@ -194,9 +193,26 @@ update_header_action (IndicatorSessionService * self) a11y = g_strdup (_("System")); } - variant = g_variant_new ("(sssb)", label, iconstr, a11y, TRUE); - g_simple_action_set_state (p->header_action, variant); + /* build the state */ + g_variant_builder_init (&b, G_VARIANT_TYPE("a{sv}")); + g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_string (a11y)); + g_variant_builder_add (&b, "{sv}", "icon", g_icon_serialize (icon)); + if (label && *label) + g_variant_builder_add (&b, "{sv}", "label", g_variant_new_string (label)); + g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE)); + state = g_variant_builder_end (&b); + + /* cleanup */ g_free (a11y); + g_object_unref (G_OBJECT (icon)); + + return state; +} + +static void +update_header_action (IndicatorSessionService * self) +{ + g_simple_action_set_state (self->priv->header_action, action_state_for_header (self)); } /*** @@ -763,8 +779,8 @@ init_gactions (IndicatorSessionService * self) p->user_switcher_action = a; /* add the header action */ - v = g_variant_new ("(sssb)", "label", ICON_DEFAULT, "a11y", TRUE); - a = g_simple_action_new_stateful ("_header", NULL, v); + a = g_simple_action_new_stateful ("_header", NULL, + action_state_for_header (self)); g_action_map_add_action (G_ACTION_MAP (p->actions), G_ACTION(a)); p->header_action = a; |