diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-18 13:59:58 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-18 13:59:58 +0200 |
| commit | b26af470b36fef91152a530c5e9bf80f2f9c5504 (patch) | |
| tree | 1c05f473a46bcaf65cd880a8ff5165ff13c7402c | |
| parent | f0f879c6848f4c6b7e0e8916c086dda19c7b608b (diff) | |
| parent | caec51f5df37cefd58db78a9e9c7c13f9a27753a (diff) | |
| download | ayatana-ido-b26af470b36fef91152a530c5e9bf80f2f9c5504.tar.gz ayatana-ido-b26af470b36fef91152a530c5e9bf80f2f9c5504.tar.bz2 ayatana-ido-b26af470b36fef91152a530c5e9bf80f2f9c5504.zip | |
Merge branch 'tari01-pr/use-consistent-ido-names'
Attributes GH PR #50: https://github.com/AyatanaIndicators/ayatana-ido/pull/50
| -rw-r--r-- | src/idomenuitemfactory.c | 12 | ||||
| -rw-r--r-- | 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 |