diff --git a/src/pmos-tweaks/README.md b/src/conf-tweaks/README.md similarity index 74% rename from src/pmos-tweaks/README.md rename to src/conf-tweaks/README.md index eaf2215d970c1d5e2e112da4a265f41ee605a3b8..cb18dae226cb5fb778c8311f4b40264efe3855c6 100644 --- a/src/pmos-tweaks/README.md +++ b/src/conf-tweaks/README.md @@ -1,9 +1,9 @@ -# Phosh Mobile Settings postmarketOS Tweaks support +# Configurable Tweaks support ## Introduction -This optional feature implements support for the YAML definition format -implemented by the now deprecated [postmarketOS Tweaks application][1]. +This feature implements support for the YAML definition format implemented by +the now deprecated [postmarketOS Tweaks application][1]. Since the original documentation is incomplete, this serves as an up-to-date reference that also includes notable changes from the original. While this diff --git a/src/pmos-tweaks/meson.build b/src/conf-tweaks/meson.build similarity index 77% rename from src/pmos-tweaks/meson.build rename to src/conf-tweaks/meson.build index 0c8638e1428fd598729138508dd71bddfbf26b3b..027d02e266a931092918efd449542ce990fea211 100644 --- a/src/pmos-tweaks/meson.build +++ b/src/conf-tweaks/meson.build @@ -1,4 +1,4 @@ -pmos_tweaks_sources = files( +conf_tweaks_sources = files( 'ms-tweaks-backend-interface.c', 'ms-tweaks-backend-interface.h', 'ms-tweaks-callback-handlers.c', @@ -7,10 +7,10 @@ pmos_tweaks_sources = files( 'ms-tweaks-gtk-utils.h', 'ms-tweaks-mappings.c', 'ms-tweaks-mappings.h', - 'ms-tweaks-page-builder.c', - 'ms-tweaks-page-builder.h', 'ms-tweaks-parser.c', 'ms-tweaks-parser.h', + 'ms-tweaks-preferences-page.c', + 'ms-tweaks-preferences-page.h', 'ms-tweaks-utils.c', 'ms-tweaks-utils.h', ) diff --git a/src/pmos-tweaks/ms-tweaks-backend-interface.c b/src/conf-tweaks/ms-tweaks-backend-interface.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-backend-interface.c rename to src/conf-tweaks/ms-tweaks-backend-interface.c diff --git a/src/pmos-tweaks/ms-tweaks-backend-interface.h b/src/conf-tweaks/ms-tweaks-backend-interface.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-backend-interface.h rename to src/conf-tweaks/ms-tweaks-backend-interface.h diff --git a/src/pmos-tweaks/ms-tweaks-callback-handlers.c b/src/conf-tweaks/ms-tweaks-callback-handlers.c similarity index 98% rename from src/pmos-tweaks/ms-tweaks-callback-handlers.c rename to src/conf-tweaks/ms-tweaks-callback-handlers.c index 5c8619438c54cf805a2f656fc05da4a70e9b5cd6..63b9b198797fc1bf3833d1fd35bca84238c52bb3 100644 --- a/src/pmos-tweaks/ms-tweaks-callback-handlers.c +++ b/src/conf-tweaks/ms-tweaks-callback-handlers.c @@ -122,7 +122,7 @@ ms_tweaks_callback_handlers_type_color (GtkColorDialogButton *widget, void ms_tweaks_callback_handlers_type_file (GObject *source_object, GAsyncResult *result, gpointer data) { - MsTweaksPageBuilderOpenFilePickerMetadata *metadata = (MsTweaksPageBuilderOpenFilePickerMetadata *) data; + MsTweaksPreferencesPageFilePickerMeta *metadata = (MsTweaksPreferencesPageFilePickerMeta *) data; g_autoptr (GtkFileDialog) file_picker_dialog = NULL; const MsTweaksSetting *setting_data = NULL; GValue path_to_picked_file = G_VALUE_INIT; diff --git a/src/pmos-tweaks/ms-tweaks-callback-handlers.h b/src/conf-tweaks/ms-tweaks-callback-handlers.h similarity index 90% rename from src/pmos-tweaks/ms-tweaks-callback-handlers.h rename to src/conf-tweaks/ms-tweaks-callback-handlers.h index 441508e0232f5d6c91cc99b1b831d1ce40486ff1..a72368147e04d5fcc0e3f129cc7b81eb68a3542c 100644 --- a/src/pmos-tweaks/ms-tweaks-callback-handlers.h +++ b/src/conf-tweaks/ms-tweaks-callback-handlers.h @@ -13,17 +13,17 @@ /** - * MsTweaksPageBuilderOpenFilePickerMetadata: + * MsTweaksPreferencesPageFilePickerMeta: * * Yes, the name is ridiculously long. Improvements welcome. * - * Used by file_widget_open_file_picker () in ms-tweaks-page-builder.c, but has to be here in a + * Used by file_widget_open_file_picker () in ms-tweaks-preferences-page.c, but has to be here in a * different header to avoid circular imports when also used in backends. */ typedef struct { MsTweaksBackend *backend_state; GtkWidget *file_picker_label; -} MsTweaksPageBuilderOpenFilePickerMetadata; +} MsTweaksPreferencesPageFilePickerMeta; void ms_tweaks_callback_handlers_type_boolean (AdwSwitchRow *switch_row, diff --git a/src/pmos-tweaks/ms-tweaks-gtk-utils.c b/src/conf-tweaks/ms-tweaks-gtk-utils.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-gtk-utils.c rename to src/conf-tweaks/ms-tweaks-gtk-utils.c diff --git a/src/pmos-tweaks/ms-tweaks-gtk-utils.h b/src/conf-tweaks/ms-tweaks-gtk-utils.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-gtk-utils.h rename to src/conf-tweaks/ms-tweaks-gtk-utils.h diff --git a/src/pmos-tweaks/ms-tweaks-mappings.c b/src/conf-tweaks/ms-tweaks-mappings.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-mappings.c rename to src/conf-tweaks/ms-tweaks-mappings.c diff --git a/src/pmos-tweaks/ms-tweaks-mappings.h b/src/conf-tweaks/ms-tweaks-mappings.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-mappings.h rename to src/conf-tweaks/ms-tweaks-mappings.h diff --git a/src/pmos-tweaks/ms-tweaks-parser.c b/src/conf-tweaks/ms-tweaks-parser.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-parser.c rename to src/conf-tweaks/ms-tweaks-parser.c diff --git a/src/pmos-tweaks/ms-tweaks-parser.h b/src/conf-tweaks/ms-tweaks-parser.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-parser.h rename to src/conf-tweaks/ms-tweaks-parser.h diff --git a/src/pmos-tweaks/ms-tweaks-page-builder.c b/src/conf-tweaks/ms-tweaks-preferences-page.c similarity index 96% rename from src/pmos-tweaks/ms-tweaks-page-builder.c rename to src/conf-tweaks/ms-tweaks-preferences-page.c index bf656a0cee8dda438af47fbb02689958f91fb1b3..e94749026f602e5b513a6dcdd95ff11e113e5402 100644 --- a/src/pmos-tweaks/ms-tweaks-page-builder.c +++ b/src/conf-tweaks/ms-tweaks-preferences-page.c @@ -6,9 +6,9 @@ * Author: Stefan Hansson */ -#define G_LOG_DOMAIN "ms-tweaks-page-builder" +#define G_LOG_DOMAIN "ms-tweaks-preferences-page" -#include "ms-tweaks-page-builder.h" +#include "ms-tweaks-preferences-page.h" #include "ms-tweaks-backend-interface.h" #include "ms-tweaks-callback-handlers.h" @@ -160,9 +160,9 @@ setting_data_to_color_widget (const MsTweaksSetting *setting_data, static void -file_widget_open_file_picker (GtkButton *widget, - GdkEvent *evnt, - MsTweaksPageBuilderOpenFilePickerMetadata *metadata) +file_widget_open_file_picker (GtkButton *widget, + GdkEvent *evnt, + MsTweaksPreferencesPageFilePickerMeta *metadata) { GtkFileDialog *file_picker_dialog = gtk_file_dialog_new (); @@ -178,9 +178,9 @@ static const char *restrict none_selected_label = "(None selected)"; static void -file_widget_unset (GtkButton *widget, - GdkEvent *evnt, - MsTweaksPageBuilderOpenFilePickerMetadata *metadata) +file_widget_unset (GtkButton *widget, + GdkEvent *evnt, + MsTweaksPreferencesPageFilePickerMeta *metadata) { MsTweaksBackendInterface *backend = MS_TWEAKS_BACKEND_GET_IFACE (metadata->backend_state); @@ -193,10 +193,10 @@ file_widget_unset (GtkButton *widget, static GtkWidget * -setting_data_to_file_widget (const MsTweaksSetting *setting_data, - MsTweaksBackend *backend_state, - const GValue *widget_value, - MsTweaksPageBuilderOpenFilePickerMetadata *metadata) +setting_data_to_file_widget (const MsTweaksSetting *setting_data, + MsTweaksBackend *backend_state, + const GValue *widget_value, + MsTweaksPreferencesPageFilePickerMeta *metadata) { GtkWidget *restrict reset_selection_button = gtk_button_new (); GtkWidget *restrict file_picker_row = adw_action_row_new (); @@ -403,7 +403,7 @@ ms_tweaks_preferences_page_initable_init (GInitable *initable, widget_to_add = setting_data_to_color_widget (setting_data, backend_state, widget_value); break; case MS_TWEAKS_TYPE_FILE: - MsTweaksPageBuilderOpenFilePickerMetadata *metadata = g_new (MsTweaksPageBuilderOpenFilePickerMetadata, 1); + MsTweaksPreferencesPageFilePickerMeta *metadata = g_new (MsTweaksPreferencesPageFilePickerMeta, 1); widget_to_add = setting_data_to_file_widget (setting_data, backend_state, widget_value, diff --git a/src/pmos-tweaks/ms-tweaks-page-builder.h b/src/conf-tweaks/ms-tweaks-preferences-page.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-page-builder.h rename to src/conf-tweaks/ms-tweaks-preferences-page.h diff --git a/src/pmos-tweaks/ms-tweaks-utils.c b/src/conf-tweaks/ms-tweaks-utils.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-utils.c rename to src/conf-tweaks/ms-tweaks-utils.c diff --git a/src/pmos-tweaks/ms-tweaks-utils.h b/src/conf-tweaks/ms-tweaks-utils.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-utils.h rename to src/conf-tweaks/ms-tweaks-utils.h diff --git a/src/meson.build b/src/meson.build index 100b924321cc230c47319ede1cdefc18ee0ea2cd..8b79d07e4ff82ea7c5d4ba9eafdbd1b5982b6d39 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,5 @@ subdir('dbus') -subdir('pmos-tweaks') +subdir('conf-tweaks') mobile_settings_enum_sources = gnome.mkenums_simple( 'ms-enum-types', @@ -131,7 +131,7 @@ mobile_settings_generated_sources = [ ms_lib = static_library( 'ms', mobile_settings_sources, - pmos_tweaks_sources, + conf_tweaks_sources, mobile_settings_generated_sources, dependencies: mobile_settings_deps, install: false, diff --git a/src/mobile-settings-window.c b/src/mobile-settings-window.c index dd1ba1e264114adca4c0619fb8e485d3fc94a380..7e4d5b7bfdf89ef25ff0a0fc32872e00cc136c93 100644 --- a/src/mobile-settings-window.c +++ b/src/mobile-settings-window.c @@ -17,9 +17,9 @@ #include "ms-feedback-panel.h" #include "ms-plugin-panel.h" -#include "pmos-tweaks/ms-tweaks-page-builder.h" -#include "pmos-tweaks/ms-tweaks-parser.h" -#include "pmos-tweaks/ms-tweaks-utils.h" +#include "conf-tweaks/ms-tweaks-parser.h" +#include "conf-tweaks/ms-tweaks-preferences-page.h" +#include "conf-tweaks/ms-tweaks-utils.h" #include diff --git a/tests/meson.build b/tests/meson.build index 31eb4041576a51c601d8fba74102c892e6de21e9..43c61124c3267d73a101c8ae57c7c3ecca3dcb2d 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -35,8 +35,8 @@ if phoc.found() unit_tests = [ 'tweaks-gtk-utils', 'tweaks-mappings', - 'tweaks-page-builder', 'tweaks-parser', + 'tweaks-preferences-page', 'tweaks-utils', ] diff --git a/tests/test-tweaks-gtk-utils.c b/tests/test-tweaks-gtk-utils.c index f5d38e29cf84837ef870aded5f4361116a386a81..b91b1cbc841fc4418e2e2e4ad28bc0bf4259e40c 100644 --- a/tests/test-tweaks-gtk-utils.c +++ b/tests/test-tweaks-gtk-utils.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "pmos-tweaks/ms-tweaks-gtk-utils.h" +#include "conf-tweaks/ms-tweaks-gtk-utils.h" static void diff --git a/tests/test-tweaks-mappings.c b/tests/test-tweaks-mappings.c index e271e293dd7b4c3961a04023a52af6f3c3af302c..152465ed5b12efb26cc8e554b7c9c37e4a449470 100644 --- a/tests/test-tweaks-mappings.c +++ b/tests/test-tweaks-mappings.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "pmos-tweaks/ms-tweaks-mappings.h" +#include "conf-tweaks/ms-tweaks-mappings.h" typedef struct { diff --git a/tests/test-tweaks-parser.c b/tests/test-tweaks-parser.c index f99b5d6a951ff2d725a2f650dc853ddaf482275c..9b45f1fc3773de394a9598f4ae2a0b28b54c203c 100644 --- a/tests/test-tweaks-parser.c +++ b/tests/test-tweaks-parser.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "pmos-tweaks/ms-tweaks-parser.h" +#include "conf-tweaks/ms-tweaks-parser.h" #define SETTING_COUNT 3 diff --git a/tests/test-tweaks-page-builder.c b/tests/test-tweaks-preferences-page.c similarity index 56% rename from tests/test-tweaks-page-builder.c rename to tests/test-tweaks-preferences-page.c index 37cc995548efa828021c3de7539d89180be5efc9..ae10718c14a5c2165841682aee037d48d26269c7 100644 --- a/tests/test-tweaks-page-builder.c +++ b/tests/test-tweaks-preferences-page.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "pmos-tweaks/ms-tweaks-page-builder.c" +#include "conf-tweaks/ms-tweaks-preferences-page.c" #include "utils/ms-tweaks-backend-dummy.h" @@ -15,14 +15,14 @@ typedef struct { MsTweaksSetting *setting; MsTweaksBackend *backend; GValue * value; -} PageBuilderTestFixture; +} PreferencesPageTestFixture; #define DEBUG_SETTING_NAME "Debug" static void -test_page_builder_fixture_setup (PageBuilderTestFixture *fixture, gconstpointer unused) +test_preferences_page_fixture_setup (PreferencesPageTestFixture *fixture, gconstpointer unused) { fixture->setting = g_new0 (MsTweaksSetting, 1); fixture->backend = ms_tweaks_backend_dummy_new (fixture->setting); @@ -40,9 +40,9 @@ test_page_builder_fixture_setup (PageBuilderTestFixture *fixture, gconstpointer static void -test_page_builder_fixture_setup_with_map (PageBuilderTestFixture *fixture, gconstpointer unused) +test_preferences_page_fixture_setup_with_map (PreferencesPageTestFixture *fixture, gconstpointer unused) { - test_page_builder_fixture_setup (fixture, unused); + test_preferences_page_fixture_setup (fixture, unused); fixture->setting->map = g_hash_table_new (g_str_hash, g_str_equal); @@ -53,7 +53,7 @@ test_page_builder_fixture_setup_with_map (PageBuilderTestFixture *fixture, gcons static void -test_page_builder_fixture_teardown (PageBuilderTestFixture *fixture, gconstpointer unused) +test_preferences_page_fixture_teardown (PreferencesPageTestFixture *fixture, gconstpointer unused) { if (fixture->setting->map) g_hash_table_destroy (fixture->setting->map); @@ -64,23 +64,23 @@ test_page_builder_fixture_teardown (PageBuilderTestFixture *fixture, gconstpoint } -#define PAGE_BUILDER_TEST_ADD(name, test_func) g_test_add ((name), \ - PageBuilderTestFixture, \ - NULL, \ - test_page_builder_fixture_setup, \ - (test_func), \ - test_page_builder_fixture_teardown) +#define PREFERENCES_PAGE_TEST_ADD(name, test_func) g_test_add ((name), \ + PreferencesPageTestFixture, \ + NULL, \ + test_preferences_page_fixture_setup, \ + (test_func), \ + test_preferences_page_fixture_teardown) -#define PAGE_BUILDER_TEST_ADD_WITH_MAP(name, test_func) g_test_add ((name), \ - PageBuilderTestFixture, \ - NULL, \ - test_page_builder_fixture_setup_with_map, \ - (test_func), \ - test_page_builder_fixture_teardown) +#define PREFERENCES_PAGE_TEST_ADD_WITH_MAP(name, test_func) g_test_add ((name), \ + PreferencesPageTestFixture, \ + NULL, \ + test_preferences_page_fixture_setup_with_map, \ + (test_func), \ + test_preferences_page_fixture_teardown) static void -test_setting_data_to_boolean_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_boolean_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_boolean_widget (fixture->setting, fixture->backend, NULL); @@ -93,7 +93,7 @@ test_setting_data_to_boolean_widget (PageBuilderTestFixture *fixture, gconstpoin static void -test_setting_data_to_boolean_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_boolean_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GValue *value = g_new0 (GValue, 1); GtkWidget *widget_1 = NULL; @@ -121,9 +121,9 @@ test_setting_data_to_boolean_widget_with_value (PageBuilderTestFixture *fixture, static void -test_setting_data_to_choice_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_choice_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { - g_test_expect_message ("ms-tweaks-page-builder", + g_test_expect_message ("ms-tweaks-preferences-page", G_LOG_LEVEL_WARNING, "[Setting \"" DEBUG_SETTING_NAME "\"] Choice widget with NULL map — either the datasource failed or the markup is wrong"); @@ -132,7 +132,7 @@ test_setting_data_to_choice_widget (PageBuilderTestFixture *fixture, gconstpoint static void -test_setting_data_to_choice_widget_with_map (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_choice_widget_with_map (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = NULL; @@ -146,7 +146,7 @@ test_setting_data_to_choice_widget_with_map (PageBuilderTestFixture *fixture, gc static void -test_setting_data_to_choice_widget_with_map_and_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_choice_widget_with_map_and_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkStringObject *string_object = NULL; GtkWidget *widget_1 = NULL; @@ -174,9 +174,9 @@ test_setting_data_to_choice_widget_with_map_and_value (PageBuilderTestFixture *f static void -test_setting_data_to_file_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_file_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { - MsTweaksPageBuilderOpenFilePickerMetadata *metadata = g_new (MsTweaksPageBuilderOpenFilePickerMetadata, 1); + MsTweaksPreferencesPageFilePickerMeta *metadata = g_new (MsTweaksPreferencesPageFilePickerMeta, 1); GtkWidget *widget = setting_data_to_file_widget (fixture->setting, fixture->backend, NULL, @@ -193,9 +193,9 @@ test_setting_data_to_file_widget (PageBuilderTestFixture *fixture, gconstpointer static void -test_setting_data_to_file_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_file_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { - MsTweaksPageBuilderOpenFilePickerMetadata *metadata = g_new (MsTweaksPageBuilderOpenFilePickerMetadata, 1); + MsTweaksPreferencesPageFilePickerMeta *metadata = g_new (MsTweaksPreferencesPageFilePickerMeta, 1); GtkWidget *widget = setting_data_to_file_widget (fixture->setting, fixture->backend, fixture->value, @@ -212,7 +212,7 @@ test_setting_data_to_file_widget_with_value (PageBuilderTestFixture *fixture, gc static void -test_setting_data_to_font_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_font_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_font_widget (fixture->setting, fixture->backend, NULL); @@ -224,7 +224,7 @@ test_setting_data_to_font_widget (PageBuilderTestFixture *fixture, gconstpointer static void -test_setting_data_to_font_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_font_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_font_widget (fixture->setting, fixture->backend, @@ -238,9 +238,9 @@ test_setting_data_to_font_widget_with_value (PageBuilderTestFixture *fixture, gc static void -test_setting_data_to_info_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_info_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { - g_test_expect_message ("ms-tweaks-page-builder", + g_test_expect_message ("ms-tweaks-preferences-page", G_LOG_LEVEL_WARNING, "[Setting \"" DEBUG_SETTING_NAME "\"] widget_value was NULL in setting_data_to_boolean_widget ()"); @@ -249,7 +249,7 @@ test_setting_data_to_info_widget (PageBuilderTestFixture *fixture, gconstpointer static void -test_setting_data_to_info_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_info_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_info_widget (fixture->setting, fixture->value); @@ -261,7 +261,7 @@ test_setting_data_to_info_widget_with_value (PageBuilderTestFixture *fixture, gc static void -test_setting_data_to_number_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_number_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_number_widget (fixture->setting, fixture->backend, NULL); @@ -273,7 +273,7 @@ test_setting_data_to_number_widget (PageBuilderTestFixture *fixture, gconstpoint static void -test_setting_data_to_number_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_number_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GValue value = G_VALUE_INIT; GtkWidget *widget = NULL; @@ -295,32 +295,32 @@ main (int argc, char *argv[]) { gtk_test_init (&argc, &argv, NULL); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-boolean-widget", - test_setting_data_to_boolean_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-boolean-widget-with-value", - test_setting_data_to_boolean_widget_with_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget", - test_setting_data_to_choice_widget); - PAGE_BUILDER_TEST_ADD_WITH_MAP ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget-with-map", - test_setting_data_to_choice_widget_with_map); - PAGE_BUILDER_TEST_ADD_WITH_MAP ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget-with-map-and-value", - test_setting_data_to_choice_widget_with_map_and_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-file-widget", - test_setting_data_to_file_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-file-widget-with-value", - test_setting_data_to_file_widget_with_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-font-widget", - test_setting_data_to_font_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-font-widget-with-value", - test_setting_data_to_font_widget_with_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-info-widget", - test_setting_data_to_info_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-info-widget-with-value", - test_setting_data_to_info_widget_with_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-number-widget", - test_setting_data_to_number_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-number-widget-with-value", - test_setting_data_to_number_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-boolean-widget", + test_setting_data_to_boolean_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-boolean-widget-with-value", + test_setting_data_to_boolean_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget", + test_setting_data_to_choice_widget); + PREFERENCES_PAGE_TEST_ADD_WITH_MAP ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget-with-map", + test_setting_data_to_choice_widget_with_map); + PREFERENCES_PAGE_TEST_ADD_WITH_MAP ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget-with-map-and-value", + test_setting_data_to_choice_widget_with_map_and_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-file-widget", + test_setting_data_to_file_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-file-widget-with-value", + test_setting_data_to_file_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-font-widget", + test_setting_data_to_font_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-font-widget-with-value", + test_setting_data_to_font_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-info-widget", + test_setting_data_to_info_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-info-widget-with-value", + test_setting_data_to_info_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-number-widget", + test_setting_data_to_number_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-number-widget-with-value", + test_setting_data_to_number_widget_with_value); return g_test_run (); } diff --git a/tests/test-tweaks-utils.c b/tests/test-tweaks-utils.c index 8d6983c23759b4d0c1a8654928d468b9dd73b09a..eaa21d7e92040b644cffd27cc198e8413ac49a32 100644 --- a/tests/test-tweaks-utils.c +++ b/tests/test-tweaks-utils.c @@ -8,7 +8,7 @@ #define G_LOG_DOMAIN "test-tweaks-utils" -#include "pmos-tweaks/ms-tweaks-utils.h" +#include "conf-tweaks/ms-tweaks-utils.h" #define TEST_WARNING_MESSAGE "scary warning: " diff --git a/tests/utils/ms-tweaks-backend-dummy.h b/tests/utils/ms-tweaks-backend-dummy.h index c119368a65e3c5cdd5b65759e5d44ef27557471e..9e573d0dea4b3f8808ca74c9174cda6dd22089de 100644 --- a/tests/utils/ms-tweaks-backend-dummy.h +++ b/tests/utils/ms-tweaks-backend-dummy.h @@ -8,7 +8,7 @@ #pragma once -#include "pmos-tweaks/ms-tweaks-backend-interface.h" +#include "conf-tweaks/ms-tweaks-backend-interface.h" G_BEGIN_DECLS