From d447b27d8364db99da6be15577f2f447234b2205 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 11 Aug 2020 12:43:54 +0200 Subject: Replace x-canonical attributes --- src/im-desktop-menu.c | 6 +++--- src/im-menu.c | 2 +- src/im-phone-menu.c | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/im-desktop-menu.c b/src/im-desktop-menu.c index 9c56d6b..7dfb7c1 100644 --- a/src/im-desktop-menu.c +++ b/src/im-desktop-menu.c @@ -114,7 +114,7 @@ im_desktop_menu_app_added (ImApplicationList *applist, GVariant *icon; item = g_menu_item_new (g_app_info_get_name (G_APP_INFO (app_info)), "launch"); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.application"); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "org.ayatana.application"); icon = g_icon_serialize (g_app_info_get_icon (G_APP_INFO (app_info))); if (icon) @@ -146,7 +146,7 @@ im_desktop_menu_app_added (ImApplicationList *applist, label = indicator_desktop_shortcuts_nick_get_name (shortcuts, *nicks); item = g_menu_item_new (label, *nicks); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.application"); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "org.ayatana.application"); g_menu_append_item (app_section, item); g_free (label); @@ -209,7 +209,7 @@ im_desktop_menu_source_section_insert_source (GMenu *source_section, action = g_strconcat ("src.", source_id, NULL); item = g_menu_item_new (label, NULL); g_menu_item_set_action_and_target_value (item, action, NULL); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.source"); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "org.ayatana.indicator.messages.source"); if (serialized_icon) g_menu_item_set_attribute_value (item, "icon", serialized_icon); diff --git a/src/im-menu.c b/src/im-menu.c index 0b98512..d1ff4a5 100644 --- a/src/im-menu.c +++ b/src/im-menu.c @@ -131,7 +131,7 @@ im_menu_init (ImMenu *menu) priv->as = im_accounts_service_ref_default(); root = g_menu_item_new (NULL, "indicator.messages"); - g_menu_item_set_attribute (root, "x-canonical-type", "s", "org.ayatana.indicator.root"); + g_menu_item_set_attribute (root, "x-ayatana-type", "s", "org.ayatana.indicator.root"); g_menu_item_set_attribute (root, "action-namespace", "s", "indicator"); g_menu_item_set_submenu (root, G_MENU_MODEL (priv->menu)); g_menu_append_item (priv->toplevel_menu, root); diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c index 01d25bb..c4d28dd 100644 --- a/src/im-phone-menu.c +++ b/src/im-phone-menu.c @@ -74,7 +74,7 @@ im_phone_menu_update_clear_section (ImPhoneMenu *menu) GMenuItem *item; item = g_menu_item_new (_("Clear All"), "remove-all"); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.button"); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "org.ayatana.indicator.button"); g_menu_append_item (menu->clear_section, item); g_object_unref (item); @@ -158,7 +158,7 @@ im_phone_menu_get_message_time (GMenuModel *model, { gint64 time; - g_menu_model_get_item_attribute (model, i, "x-canonical-time", "x", &time); + g_menu_model_get_item_attribute (model, i, "x-ayatana-time", "x", &time); return time; } @@ -191,25 +191,25 @@ im_phone_menu_add_message (ImPhoneMenu *menu, item = g_menu_item_new (title, NULL); g_menu_item_set_action_and_target_value (item, action_name, g_variant_new_boolean (TRUE)); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.messageitem"); - g_menu_item_set_attribute (item, "x-canonical-message-id", "s", id); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "org.ayatana.indicator.messages.messageitem"); + g_menu_item_set_attribute (item, "x-ayatana-message-id", "s", id); if (show_data) - g_menu_item_set_attribute (item, "x-canonical-subtitle", "s", subtitle); + g_menu_item_set_attribute (item, "x-ayatana-subtitle", "s", subtitle); if (show_data) - g_menu_item_set_attribute (item, "x-canonical-text", "s", body); - g_menu_item_set_attribute (item, "x-canonical-time", "x", time); + g_menu_item_set_attribute (item, "x-ayatana-text", "s", body); + g_menu_item_set_attribute (item, "x-ayatana-time", "x", time); if (serialized_icon) g_menu_item_set_attribute_value (item, "icon", serialized_icon); if (app_icon && (serialized_app_icon = g_icon_serialize (app_icon))) { - g_menu_item_set_attribute_value (item, "x-canonical-app-icon", serialized_app_icon); + g_menu_item_set_attribute_value (item, "x-ayatana-app-icon", serialized_app_icon); g_variant_unref (serialized_app_icon); } if (actions && show_data) - g_menu_item_set_attribute (item, "x-canonical-message-actions", "v", actions); + g_menu_item_set_attribute (item, "x-ayatana-message-actions", "v", actions); n_messages = g_menu_model_get_n_items (G_MENU_MODEL (menu->message_section)); pos = 0; @@ -262,10 +262,10 @@ im_phone_menu_add_source (ImPhoneMenu *menu, item = g_menu_item_new (label, NULL); g_menu_item_set_action_and_target_value (item, action_name, g_variant_new_boolean (TRUE)); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.sourceitem"); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "org.ayatana.indicator.messages.sourceitem"); if (iconstr) - g_menu_item_set_attribute (item, "x-canonical-icon", "s", iconstr); + g_menu_item_set_attribute (item, "x-ayatana-icon", "s", iconstr); g_menu_prepend_item (menu->source_section, item); -- cgit v1.2.3