diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | include/datetime/settings.h | 2 | ||||
| -rw-r--r-- | src/menu.cpp | 8 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/test-menus.cpp | 10 |
5 files changed, 12 insertions, 12 deletions
@@ -64,7 +64,7 @@ CUSTOM MENUITEMS * Appointment - label s short summary of the appointment - - x-canonical-type s "com.canonical.indicator.appointment" + - x-canonical-type s "org.ayatana.indicator.appointment" - x-canonical-color s color of the appt's type, to give a visual cue - x-canonical-time x the date of the appointment - x-canonical-time-format s strftime format string diff --git a/include/datetime/settings.h b/include/datetime/settings.h index 6ee3e97..631c547 100644 --- a/include/datetime/settings.h +++ b/include/datetime/settings.h @@ -33,7 +33,7 @@ namespace datetime { /** * \brief Interface that represents user-configurable settings. * - * See the descriptions in data/com.canonical.indicator.datetime.gschema.xml + * See the descriptions in data/org.ayatana.indicator.datetime.gschema.xml * for more information on specific properties. */ class Settings diff --git a/src/menu.cpp b/src/menu.cpp index 7be3719..9d229c6 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -220,7 +220,7 @@ private: const auto detailed_action = std::string("indicator.") + name() + "-header"; auto header = g_menu_item_new(nullptr, detailed_action.c_str()); g_menu_item_set_attribute(header, "x-canonical-type", "s", - "com.canonical.indicator.root"); + "org.ayatana.indicator.root"); g_menu_item_set_attribute(header, "submenu-action", "s", "indicator.calendar-active"); g_menu_item_set_submenu(header, G_MENU_MODEL(m_submenu)); @@ -274,7 +274,7 @@ private: v = g_variant_new_int64(0); g_menu_item_set_action_and_target_value (item, "indicator.calendar", v); g_menu_item_set_attribute (item, "x-canonical-type", - "s", "com.canonical.indicator.calendar"); + "s", "org.ayatana.indicator.calendar"); if (action_name != nullptr) g_menu_item_set_attribute (item, "activation-action", "s", action_name); g_menu_append_item (menu, item); @@ -329,7 +329,7 @@ private: } else { - g_menu_item_set_attribute (menu_item, "x-canonical-type", "s", "com.canonical.indicator.appointment"); + g_menu_item_set_attribute (menu_item, "x-canonical-type", "s", "org.ayatana.indicator.appointment"); } if (!appt.color.empty()) @@ -394,7 +394,7 @@ private: const auto fmt = m_formatter->relative_format(zone_now.get()); auto detailed_action = g_strdup_printf("indicator.set-location::%s %s", zone.c_str(), name.c_str()); auto i = g_menu_item_new (name.c_str(), detailed_action); - g_menu_item_set_attribute(i, "x-canonical-type", "s", "com.canonical.indicator.location"); + g_menu_item_set_attribute(i, "x-canonical-type", "s", "org.ayatana.indicator.location"); g_menu_item_set_attribute(i, "x-canonical-timezone", "s", zone.c_str()); g_menu_item_set_attribute(i, "x-canonical-time-format", "s", fmt.c_str()); g_menu_append_item (menu, i); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8e5e187..010a426 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -26,7 +26,7 @@ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compil OUTPUT_VARIABLE COMPILE_SCHEMA_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE) add_custom_command (OUTPUT gschemas.compiled - DEPENDS ${CMAKE_BINARY_DIR}/data/com.canonical.indicator.datetime.gschema.xml + DEPENDS ${CMAKE_BINARY_DIR}/data/org.ayatana.indicator.datetime.gschema.xml COMMAND cp -f ${CMAKE_BINARY_DIR}/data/*gschema.xml ${SCHEMA_DIR} COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR}) diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp index f0c5653..ba223f2 100644 --- a/tests/test-menus.cpp +++ b/tests/test-menus.cpp @@ -63,7 +63,7 @@ protected: EXPECT_EQ(1,g_menu_model_get_n_items(menu_model)); gchar* str = nullptr; g_menu_model_get_item_attribute(menu_model, 0, "x-canonical-type", "s", &str); - EXPECT_STREQ("com.canonical.indicator.root", str); + EXPECT_STREQ("org.ayatana.indicator.root", str); g_clear_pointer(&str, g_free); g_menu_model_get_item_attribute(menu_model, 0, G_MENU_ATTRIBUTE_ACTION, "s", &str); const auto action_name = name + "-header"; @@ -134,7 +134,7 @@ protected: if (calendar_expected) { g_menu_model_get_item_attribute(section, 1, "x-canonical-type", "s", &str); - EXPECT_STREQ("com.canonical.indicator.calendar", str); + EXPECT_STREQ("org.ayatana.indicator.calendar", str); g_clear_pointer(&str, g_free); g_menu_model_get_item_attribute(section, 1, G_MENU_ATTRIBUTE_ACTION, "s", &str); @@ -211,9 +211,9 @@ private: gchar * str = nullptr; g_menu_model_get_item_attribute(section, index, "x-canonical-type", "s", &str); if (appt.is_ubuntu_alarm()) - EXPECT_STREQ("com.canonical.indicator.alarm", str); + EXPECT_STREQ("org.ayatana.indicator.alarm", str); else - EXPECT_STREQ("com.canonical.indicator.appointment", str); + EXPECT_STREQ("org.ayatana.indicator.appointment", str); g_clear_pointer(&str, g_free); // confirm it has a nonempty x-canonical-time-format @@ -406,7 +406,7 @@ protected: // confirm that the x-canonical-type is right g_menu_model_get_item_attribute(section, i, "x-canonical-type", "s", &str); - EXPECT_STREQ("com.canonical.indicator.location", str); + EXPECT_STREQ("org.ayatana.indicator.location", str); g_clear_pointer(&str, g_free); // confirm that the timezones match the ones in the vector |