Fix #1071

alainm23 · Dec 11, 2023 · e8ca8de · e8ca8de
1 parent 6279e37
commit e8ca8de
Show file tree

Hide file tree

Showing 21 changed files with 661 additions and 2,662 deletions.
diff --git a/config.vala.in b/config.vala.in
@@ -0,0 +1,8 @@
+namespace Build {
+    public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
+    public const string APPLICATION_ID = @APPLICATION_ID@;
+    public const string VERSION = @VERSION@;
+    public const string INSTALL_PREFIX = @PREFIX@;
+    public const string DATADIR = @DATADIR@;
+    public const string PROFILE = @PROFILE@;
+}
diff --git a/core/config.vala.in → core/Constants.vala b/core/config.vala.in → core/Constants.vala
@@ -1,13 +1,7 @@
 namespace Constants {
-    public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
-    public const string APPLICATION_ID = @APPLICATION_ID@;
-    public const string VERSION = @VERSION@;
-    public const string INSTALL_PREFIX = @PREFIX@;
-    public const string DATADIR = @DATADIR@;
     public const string TODOIST_CLIENT_ID = "b0dd7d3714314b1dbbdab9ee03b6b432";
     public const string TODOIST_CLIENT_SECRET = "a86dfeb12139459da3e5e2a8c197c678";
     public const string TODOIST_SCOPE = "data:read_write,data:delete,project:delete";
-    public const string PROFILE = @PROFILE@;
     public const int UPDATE_TIMEOUT = 1500;
     public const int DESTROY_TIMEOUT = 750;
     public const int DRAG_TIMEOUT = 225;

diff --git a/src/Widgets/LoadingButton.vala → core/Widgets/LoadingButton.vala b/src/Widgets/LoadingButton.vala → core/Widgets/LoadingButton.vala
diff --git a/core/meson.build b/core/meson.build
@@ -1,24 +1,10 @@
-conf_data = configuration_data()
-conf_data.set_quoted('APPLICATION_ID', application_id)
-conf_data.set_quoted('GETTEXT_PACKAGE', application_id)
-conf_data.set_quoted('VERSION', meson.project_version())
-conf_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
-conf_data.set_quoted('PACKAGE_VERSION', meson.project_version())
-conf_data.set_quoted('PREFIX', get_option('prefix'))
-conf_data.set_quoted('DATADIR', join_paths (get_option('prefix'), get_option('datadir')))
-conf_data.set_quoted('PROFILE', profile)
-
-config_file = configure_file(
-    configuration : conf_data,
-    input : 'config.vala.in',
-    output : 'config.vala'
-)
-
 core_files = files(
     'Utils.vala',
     'Enum.vala',
+    'Constants.vala',
     'Services/Settings.vala',
-    'Widgets/DynamicIcon.vala'
+    'Widgets/DynamicIcon.vala',
+    'Widgets/LoadingButton.vala'
 )
 
 core_deps = [