From 974147dfa1c3c8c23238e5749ebe7fafae751a84 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 11 Aug 2020 16:49:26 +0200 Subject: Replace x-canonical attributes solely used by Ayatana Indicators. --- src/idoalarmmenuitem.c | 4 ++-- src/idoappointmentmenuitem.c | 6 +++--- src/idolocationmenuitem.c | 4 ++-- src/idoplaybackmenuitem.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/idoalarmmenuitem.c b/src/idoalarmmenuitem.c index c9cfcd9..7ea7724 100644 --- a/src/idoalarmmenuitem.c +++ b/src/idoalarmmenuitem.c @@ -72,7 +72,7 @@ ido_alarm_menu_item_new_from_model (GMenuItem * menu_item, n++; } - if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-ayatana-time-format", "s", &str)) { names[n] = "format"; g_value_init (&values[n], G_TYPE_STRING); @@ -80,7 +80,7 @@ ido_alarm_menu_item_new_from_model (GMenuItem * menu_item, n++; } - if (g_menu_item_get_attribute (menu_item, "x-canonical-time", "x", &i64)) + if (g_menu_item_get_attribute (menu_item, "x-ayatana-time", "x", &i64)) { names[n] = "date-time"; g_value_init (&values[n], G_TYPE_DATE_TIME); diff --git a/src/idoappointmentmenuitem.c b/src/idoappointmentmenuitem.c index 1b537ed..23259f7 100644 --- a/src/idoappointmentmenuitem.c +++ b/src/idoappointmentmenuitem.c @@ -106,7 +106,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem * menu_item, n++; } - if (g_menu_item_get_attribute (menu_item, "x-canonical-color", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-ayatana-color", "s", &str)) { names[n] = "icon"; g_value_init (&values[n], G_TYPE_OBJECT); @@ -115,7 +115,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem * menu_item, n++; } - if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-ayatana-time-format", "s", &str)) { names[n] = "format"; g_value_init (&values[n], G_TYPE_STRING); @@ -123,7 +123,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem * menu_item, n++; } - if (g_menu_item_get_attribute (menu_item, "x-canonical-time", "x", &i64)) + if (g_menu_item_get_attribute (menu_item, "x-ayatana-time", "x", &i64)) { names[n] = "date-time"; g_value_init (&values[n], G_TYPE_DATE_TIME); diff --git a/src/idolocationmenuitem.c b/src/idolocationmenuitem.c index 4361e50..3c8cce3 100644 --- a/src/idolocationmenuitem.c +++ b/src/idolocationmenuitem.c @@ -313,7 +313,7 @@ ido_location_menu_item_new_from_model (GMenuItem * menu_item, n++; } - if (g_menu_item_get_attribute (menu_item, "x-canonical-timezone", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-ayatana-timezone", "s", &str)) { names[n] = "timezone"; g_value_init (&values[n], G_TYPE_STRING); @@ -321,7 +321,7 @@ ido_location_menu_item_new_from_model (GMenuItem * menu_item, n++; } - if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-ayatana-time-format", "s", &str)) { names[n] = "format"; g_value_init (&values[n], G_TYPE_STRING); diff --git a/src/idoplaybackmenuitem.c b/src/idoplaybackmenuitem.c index 06ac8af..4c90442 100644 --- a/src/idoplaybackmenuitem.c +++ b/src/idoplaybackmenuitem.c @@ -457,9 +457,9 @@ ido_playback_menu_item_new_from_model (GMenuItem *item, g_signal_connect (actions, "action-added", G_CALLBACK (ido_playback_menu_item_action_added), widget); g_signal_connect (actions, "action-removed", G_CALLBACK (ido_playback_menu_item_action_removed), widget); - g_menu_item_get_attribute (item, "x-canonical-play-action", "s", &widget->button_actions[BUTTON_PLAYPAUSE]); - g_menu_item_get_attribute (item, "x-canonical-next-action", "s", &widget->button_actions[BUTTON_NEXT]); - g_menu_item_get_attribute (item, "x-canonical-previous-action", "s", &widget->button_actions[BUTTON_PREVIOUS]); + g_menu_item_get_attribute (item, "x-ayatana-play-action", "s", &widget->button_actions[BUTTON_PLAYPAUSE]); + g_menu_item_get_attribute (item, "x-ayatana-next-action", "s", &widget->button_actions[BUTTON_NEXT]); + g_menu_item_get_attribute (item, "x-ayatana-previous-action", "s", &widget->button_actions[BUTTON_PREVIOUS]); play_action = widget->button_actions[BUTTON_PLAYPAUSE]; if (play_action && g_action_group_has_action (actions, play_action)) -- cgit v1.2.3