From caec51f5df37cefd58db78a9e9c7c13f9a27753a Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 20 Sep 2021 14:41:52 +0200 Subject: Use consistent Ayatana IDO names --- src/idomenuitemfactory.c | 12 ++++++------ src/idousermenuitem.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/idomenuitemfactory.c b/src/idomenuitemfactory.c index e259664..7f9978c 100644 --- a/src/idomenuitemfactory.c +++ b/src/idomenuitemfactory.c @@ -57,10 +57,10 @@ ido_menu_item_factory_create_menu_item (AyatanaMenuItemFactory *factory, { GtkMenuItem *item = NULL; - if (g_str_equal (type, "indicator.user-menu-item")) + if (g_str_equal (type, "org.ayatana.indicator.user-menu-item")) item = ido_user_menu_item_new_from_model (menuitem, actions); - if (g_str_equal (type, "indicator.guest-menu-item")) + if (g_str_equal (type, "org.ayatana.indicator.guest-menu-item")) item = ido_guest_menu_item_new_from_model (menuitem, actions); else if (g_str_equal (type, "org.ayatana.indicator.calendar")) @@ -81,16 +81,16 @@ ido_menu_item_factory_create_menu_item (AyatanaMenuItemFactory *factory, else if (g_str_equal (type, "org.ayatana.indicator.progress")) item = ido_progress_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "org.ayatana.unity.slider")) + else if (g_str_equal (type, "org.ayatana.indicator.slider")) item = ido_scale_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "org.ayatana.unity.media-player")) + else if (g_str_equal (type, "org.ayatana.indicator.media-player")) item = ido_media_player_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "org.ayatana.unity.playback-item")) + else if (g_str_equal (type, "org.ayatana.indicator.playback-item")) item = ido_playback_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "org.ayatana.application")) + else if (g_str_equal (type, "org.ayatana.indicator.application")) item = ido_application_menu_item_new_from_model (menuitem, actions); else if (g_str_equal (type, "org.ayatana.indicator.messages.source")) diff --git a/src/idousermenuitem.c b/src/idousermenuitem.c index 96bbeb4..1f157ae 100644 --- a/src/idousermenuitem.c +++ b/src/idousermenuitem.c @@ -397,7 +397,7 @@ ido_user_menu_item_new (void) /* * This is a helper function for creating user menuitems for both - * "indicator.user-menu-item" and "indicator.guest-menu-item", + * "org.ayatana.indicator.user-menu-item" and "org.ayatana.indicator.guest-menu-item", * since they only differ in how they use their action's state. */ static GtkMenuItem * @@ -472,7 +472,7 @@ user_menu_item_new_from_model (GMenuItem * menuitem, } /*** -**** indicator.user-menu-item handler +**** org.ayatana.indicator.user-menu-item handler ***/ /** @@ -546,7 +546,7 @@ ido_user_menu_item_new_from_model (GMenuItem *menuitem, } /*** -**** indicator.guest-menu-item handler +**** org.ayatana.indicator.guest-menu-item handler ***/ static void -- cgit v1.2.3