diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-08-11 14:09:24 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-08-11 14:09:24 +0200 |
| commit | 27f00a52a6d0b1c51c874009616b0488e322c7da (patch) | |
| tree | 29c06090445e2acc8e7bf7c91e708f6e3c181b65 | |
| parent | f57637e5e01618ed20fa2c0cba16adfd1be12922 (diff) | |
| parent | 004ae04407de33dadab99298c94323cb433d3d27 (diff) | |
| download | libayatana-indicator-27f00a52a6d0b1c51c874009616b0488e322c7da.tar.gz libayatana-indicator-27f00a52a6d0b1c51c874009616b0488e322c7da.tar.bz2 libayatana-indicator-27f00a52a6d0b1c51c874009616b0488e322c7da.zip | |
Merge branch 'tari01-pr/replace-x-canonical-attributes'
Attributes GH PR #9: https://github.com/AyatanaIndicators/libayatana-indicator/pull/9
| -rw-r--r-- | libayatana-indicator/indicator-ng.c | 8 | ||||
| -rw-r--r-- | tests/indicator-test-service.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libayatana-indicator/indicator-ng.c b/libayatana-indicator/indicator-ng.c index ae39f63..8ede1a6 100644 --- a/libayatana-indicator/indicator-ng.c +++ b/libayatana-indicator/indicator-ng.c @@ -236,7 +236,7 @@ static gboolean indicator_ng_menu_insert_idos(IndicatorNg *self, GMenuModel *pSe { gboolean bChanged = FALSE; gchar *sType; - gboolean bHasType = g_menu_model_get_item_attribute(pSection, nModelItem, "x-canonical-type", "s", &sType); + gboolean bHasType = g_menu_model_get_item_attribute(pSection, nModelItem, "x-ayatana-type", "s", &sType); if (bHasType) { @@ -556,7 +556,7 @@ indicator_ng_menu_item_is_of_type (GMenuModel *menu, gchar *type; gboolean has_type = FALSE; - if (g_menu_model_get_item_attribute (menu, index, "x-canonical-type", "s", &type)) + if (g_menu_model_get_item_attribute (menu, index, "x-ayatana-type", "s", &type)) { has_type = g_str_equal (type, expected_type); g_free (type); @@ -602,14 +602,14 @@ indicator_ng_menu_changed (GMenuModel *menu, g_free (action); } - if (g_menu_model_get_item_attribute (self->menu, 0, "x-canonical-scroll-action", "s", &action)) + if (g_menu_model_get_item_attribute (self->menu, 0, "x-ayatana-scroll-action", "s", &action)) { if (g_str_has_prefix (action, "indicator.")) self->scroll_action = g_strdup (action + strlen ("indicator.")); g_free (action); } - if (g_menu_model_get_item_attribute (self->menu, 0, "x-canonical-secondary-action", "s", &action)) + if (g_menu_model_get_item_attribute (self->menu, 0, "x-ayatana-secondary-action", "s", &action)) { if (g_str_has_prefix (action, "indicator.")) self->secondary_action = g_strdup (action + strlen ("indicator.")); diff --git a/tests/indicator-test-service.c b/tests/indicator-test-service.c index 39e7ea6..d457861 100644 --- a/tests/indicator-test-service.c +++ b/tests/indicator-test-service.c @@ -83,7 +83,7 @@ main (int argc, char **argv) submenu = g_menu_new (); g_menu_append (submenu, "Show", "indicator.show"); item = g_menu_item_new (NULL, "indicator._header"); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.root"); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "org.ayatana.indicator.root"); g_menu_item_set_submenu (item, G_MENU_MODEL (submenu)); indicator.menu = g_menu_new (); g_menu_append_item (indicator.menu, item); |