aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2020-08-11 11:40:17 +0200
committerRobert Tari <robert@tari.in>2020-08-11 11:40:17 +0200
commit900c82414c16bbb7fa757f339ccf2100cd2d3052 (patch)
treedd7c88a47c3b65380c8a47c442739899015e1c7f
parent6a989d2bf5a215ceef32c58e0e21a91842bff7de (diff)
downloadayatana-indicator-session-900c82414c16bbb7fa757f339ccf2100cd2d3052.tar.gz
ayatana-indicator-session-900c82414c16bbb7fa757f339ccf2100cd2d3052.tar.bz2
ayatana-indicator-session-900c82414c16bbb7fa757f339ccf2100cd2d3052.zip
Replace x-canonical attributes
-rw-r--r--README.md4
-rw-r--r--src/service.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/README.md b/README.md
index 889aa66..36f6a90 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ https://wiki.ayatana-indicators.org/AyatanaIndicatorSession
specification, both need four visual components: (1) an Active Session
Mark, the user's (2) icon, (3) name, and (4) a Logged In Mark.
-### User menuitems have "x-canonical-type" set to "indicator.user-menu-item"
+### User menuitems have "x-ayatana-type" set to "indicator.user-menu-item"
Their four visual components are determined by:
@@ -34,7 +34,7 @@ Mark, the user's (2) icon, (3) name, and (4) a Logged In Mark.
an array of usernames. If the array contains the username in this
menuitem's "target" attribute, show the Logged In Mark.
-### The Guest switcher has "x-canonical-type" set to "indicator.guest-menu-item" action
+### The Guest switcher has "x-ayatana-type" set to "indicator.guest-menu-item" action
Its four visual components are determined by:
diff --git a/src/service.c b/src/service.c
index 30ba3bb..4f547b3 100644
--- a/src/service.c
+++ b/src/service.c
@@ -387,7 +387,7 @@ create_guest_switcher_state (IndicatorSessionService * self)
}
/**
- * The switch-to-user action's state is a dictionary with these entries:
+ * The switch-to-user action's state is a dictionary with these entries:
* - "active-user" (username string)
* - "logged-in-users" (array of username strings)
*/
@@ -618,7 +618,7 @@ create_switch_section (IndicatorSessionService * self, int profile)
GMenuItem *item;
item = g_menu_item_new (_("Guest Session"), "indicator.switch-to-guest");
- g_menu_item_set_attribute (item, "x-canonical-type", "s", "indicator.guest-menu-item");
+ g_menu_item_set_attribute (item, "x-ayatana-type", "s", "indicator.guest-menu-item");
g_menu_append_item (menu, item);
g_object_unref (item);
@@ -666,7 +666,7 @@ create_switch_section (IndicatorSessionService * self, int profile)
item = g_menu_item_new (label, NULL);
g_menu_item_set_action_and_target (item, "indicator.switch-to-user", "s", u->user_name);
- g_menu_item_set_attribute (item, "x-canonical-type", "s", "indicator.user-menu-item");
+ g_menu_item_set_attribute (item, "x-ayatana-type", "s", "indicator.user-menu-item");
if ((serialized_icon = serialize_icon_file (u->icon_file)))
{
@@ -717,14 +717,14 @@ create_session_section (IndicatorSessionService * self, int profile)
if (indicator_session_actions_can_hibernate (p->backend_actions))
g_menu_append (menu, _("Hibernate"), "indicator.hibernate");
- if (profile != PROFILE_LOCKSCREEN &&
+ if (profile != PROFILE_LOCKSCREEN &&
indicator_session_actions_can_reboot (p->backend_actions))
{
const char * label = ellipsis ? _("Restart…") : _("Restart");
g_menu_append (menu, label, "indicator.reboot");
}
- if (profile != PROFILE_LOCKSCREEN &&
+ if (profile != PROFILE_LOCKSCREEN &&
!g_settings_get_boolean (s, "suppress-shutdown-menuitem"))
{
const char * label = ellipsis ? _("Shut Down…") : _("Shut Down");
@@ -775,7 +775,7 @@ create_menu (IndicatorSessionService * self, int profile)
/* add submenu to the header */
header = g_menu_item_new (NULL, "indicator._header");
- g_menu_item_set_attribute (header, "x-canonical-type", "s", "org.ayatana.indicator.root");
+ g_menu_item_set_attribute (header, "x-ayatana-type", "s", "org.ayatana.indicator.root");
g_menu_item_set_submenu (header, G_MENU_MODEL (submenu));
g_object_unref (submenu);
@@ -1281,13 +1281,13 @@ my_get_property (GObject * o,
GParamSpec * pspec)
{
IndicatorSessionService * self = INDICATOR_SESSION_SERVICE (o);
-
+
switch (property_id)
{
case PROP_MAX_USERS:
g_value_set_uint (value, self->priv->max_users);
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
}