aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-17 09:50:23 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-17 09:50:23 +0200
commit9ab3198cb29545c656ac9f8b16ebdfa7e2e298e8 (patch)
tree4599b69238f948a8b55c2841a4d9297ae74a6323
parentc1950d07d40a2a24cf5e22bdc2743fcf08f1afdb (diff)
downloadayatana-indicator-session-9ab3198cb29545c656ac9f8b16ebdfa7e2e298e8.tar.gz
ayatana-indicator-session-9ab3198cb29545c656ac9f8b16ebdfa7e2e298e8.tar.bz2
ayatana-indicator-session-9ab3198cb29545c656ac9f8b16ebdfa7e2e298e8.zip
switch back to x-canonical-type
-rw-r--r--README4
-rw-r--r--src/service.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/README b/README
index b3fc3aa..addf3bb 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ As per the https://wiki.ubuntu.com/SystemMenu 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-ayatanaindicator-type" set to "indicator.user-menu-item"
+== User menuitems have "x-canonical-type" set to "indicator.user-menu-item"
Their four visual components are determined by:
1. You can test for the Action Session Mark by checking the action's state.
@@ -30,7 +30,7 @@ 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-ayatanaindicator-type" set to "indicator.guest-menu-item"
+== The Guest switcher has "x-canonical-type" set to "indicator.guest-menu-item"
action. Its four visual components are determined by:
1. You can test for the Active Session Mark by checking the action's state.
diff --git a/src/service.c b/src/service.c
index a064e1a..46c3c19 100644
--- a/src/service.c
+++ b/src/service.c
@@ -691,7 +691,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-ayatanaindicator-type", "s", "indicator.guest-menu-item");
+ g_menu_item_set_attribute (item, "x-canonical-type", "s", "indicator.guest-menu-item");
g_menu_append_item (menu, item);
g_object_unref (item);
@@ -739,7 +739,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-ayatanaindicator-type", "s", "indicator.user-menu-item");
+ g_menu_item_set_attribute (item, "x-canonical-type", "s", "indicator.user-menu-item");
if ((serialized_icon = serialize_icon_file (u->icon_file)))
{
@@ -848,7 +848,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-ayatanaindicator-type", "s", "org.ayatana.indicator.root");
+ g_menu_item_set_attribute (header, "x-canonical-type", "s", "org.ayatana.indicator.root");
g_menu_item_set_submenu (header, G_MENU_MODEL (submenu));
g_object_unref (submenu);