diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-11-16 16:05:54 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-11-16 16:05:54 +0100 |
| commit | c9b08c107634035ee87ec88f3a4b7a1499588fa4 (patch) | |
| tree | 347257f46b8443eea40c909bb869858be5ed47d1 | |
| parent | 1748adda068bffac00fd8c67693a3e003c36d06d (diff) | |
| download | libayatana-indicator-c9b08c107634035ee87ec88f3a4b7a1499588fa4.tar.gz libayatana-indicator-c9b08c107634035ee87ec88f3a4b7a1499588fa4.tar.bz2 libayatana-indicator-c9b08c107634035ee87ec88f3a4b7a1499588fa4.zip | |
Use x-ayatanaindicator-* instead of x-canonical-*.
| -rw-r--r-- | libayatana-indicator/indicator-ng.c | 6 | ||||
| -rw-r--r-- | tests/indicator-test-service.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libayatana-indicator/indicator-ng.c b/libayatana-indicator/indicator-ng.c index e645522..db234c9 100644 --- a/libayatana-indicator/indicator-ng.c +++ b/libayatana-indicator/indicator-ng.c @@ -358,7 +358,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-ayatanaindicator-type", "s", &type)) { has_type = g_str_equal (type, expected_type); g_free (type); @@ -404,14 +404,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-ayatanaindicator-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-ayatanaindicator-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 2aa973e..8ab9208 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-ayatanaindicator-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); |