Merge branch 'tari01-pr/replace-x-canonical-attributes'

Attributes GH PR #5: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/5

2 files changed, 6 insertions, 6 deletions

diff --git a/src/exporter.cpp b/src/exporter.cpp
index b415a81..b3d586b 100644
--- a/src/exporter.cpp
+++ b/src/exporter.cpp
@@ -90,7 +90,7 @@ private:
     GError* error;
     char* object_path;
     guint id;
-     
+
     // export the actions
 
     error = nullptr;
@@ -142,7 +142,7 @@ private:
         auto state = create_header_state(header);
         char* tmp = g_variant_print(state, true);
         g_debug("header changed; updating action state to '%s'", tmp);
-        g_action_group_change_action_state(G_ACTION_GROUP(action_group), 
+        g_action_group_change_action_state(G_ACTION_GROUP(action_group),
                                            action_name.c_str(),
                                            create_header_state(header));
         g_free(tmp);
@@ -151,7 +151,7 @@ private:
     // build the header menu
     auto detailed_action = g_strdup_printf("indicator.%s", action_name.c_str());
     GMenuItem* header = g_menu_item_new(nullptr, detailed_action);
-    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, profile->menu_model().get());
     g_free(detailed_action);
 
diff --git a/src/rotation-lock.cpp b/src/rotation-lock.cpp
index 9af5f8e..5cbbc60 100644
--- a/src/rotation-lock.cpp
+++ b/src/rotation-lock.cpp
@@ -80,7 +80,7 @@ private:
   {
     return g_value_dup_variant(value);
   }
- 
+
   GSimpleActionGroup* create_action_group()
   {
     GSimpleActionGroup* group;
@@ -97,7 +97,7 @@ private:
                                  action_state_to_settings,
                                  nullptr,
                                  nullptr);
-                                 
+
     g_action_map_add_action(G_ACTION_MAP(group), G_ACTION(action));
     g_object_unref(G_OBJECT(action));
     g_signal_connect_swapped(m_settings, "changed::rotation-lock",
@@ -123,7 +123,7 @@ private:
     menu = g_menu_new();
 
     menu_item = g_menu_item_new(_("Rotation Lock"), "indicator.rotation-lock");
-    g_menu_item_set_attribute(menu_item, "x-canonical-type", "s", "org.ayatana.indicator.switch");
+    g_menu_item_set_attribute(menu_item, "x-ayatana-type", "s", "org.ayatana.indicator.switch");
     g_menu_append_item(menu, menu_item);
     g_object_unref(menu_item);