Merge branch 'main' into danirabbit/battery-notification

elementary · Oct 8, 2024 · 1a930b5 · 1a930b5
2 parents 66e52b2 + 11ecfdd
commit 1a930b5
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 36 deletions.
diff --git a/data/meson.build b/data/meson.build
@@ -1,6 +1,3 @@
-autostartdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
-schemadir = join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
-
 i18n.merge_file(
     input: meson.project_name() + '.desktop.in',
     output: meson.project_name() + '.desktop',
@@ -19,39 +16,6 @@ i18n.merge_file(
     install_dir: get_option('datadir') / 'metainfo',
 )
 
-install_data(
-    'installer.desktop',
-    install_dir: join_paths(get_option('datadir'), 'xsessions')
-)
-
-install_data(
-    'autostart.desktop',
-    install_dir: autostartdir,
-    rename: meson.project_name() + '.desktop'
-)
-
-install_data(
-    'compositor-autostart.desktop',
-    install_dir: autostartdir,
-    rename: meson.project_name() + '.compositor.desktop'
-)
-
-install_subdir(
-    'gsd',
-    install_dir: autostartdir,
-    strip_directory: true
-)
-
-install_data(
-    'installer.session',
-    install_dir: join_paths(get_option('datadir'), 'gnome-session', 'sessions')
-)
-
-install_data(
-    'installer-default-settings.gschema.override',
-    install_dir: schemadir
-)
-
 # Test the desktop file
 validate_desktop_exe = find_program('desktop-file-validate')
 test ('Validate desktop file', validate_desktop_exe,

diff --git a/meson.build b/meson.build
@@ -41,5 +41,6 @@ subdir('po')
 subdir('common')
 subdir('daemon')
 subdir('src')
+subdir('session')
 subdir('data')
 subdir('test')
diff --git a/data/autostart.desktop → session/autostart.desktop b/data/autostart.desktop → session/autostart.desktop
diff --git a/data/compositor-autostart.desktop → session/compositor-autostart.desktop b/data/compositor-autostart.desktop → session/compositor-autostart.desktop
diff --git a/...ettingsDaemon.MediaKeys-installer.desktop → ...ettingsDaemon.MediaKeys-installer.desktop b/...ettingsDaemon.MediaKeys-installer.desktop → ...ettingsDaemon.MediaKeys-installer.desktop
diff --git a/...me.SettingsDaemon.Power-installer.desktop → ...me.SettingsDaemon.Power-installer.desktop b/...me.SettingsDaemon.Power-installer.desktop → ...me.SettingsDaemon.Power-installer.desktop
diff --git a/...ettingsDaemon.XSettings-installer.desktop → ...ettingsDaemon.XSettings-installer.desktop b/...ettingsDaemon.XSettings-installer.desktop → ...ettingsDaemon.XSettings-installer.desktop
diff --git a/...staller-default-settings.gschema.override → ...staller-default-settings.gschema.override b/...staller-default-settings.gschema.override → ...staller-default-settings.gschema.override
diff --git a/data/installer.desktop → session/installer.desktop b/data/installer.desktop → session/installer.desktop
diff --git a/data/installer.session → session/installer.session b/data/installer.session → session/installer.session
diff --git a/session/meson.build b/session/meson.build
@@ -0,0 +1,35 @@
+autostartdir = get_option('sysconfdir') / 'xdg' / 'autostart'
+schemadir = get_option('datadir') / 'glib-2.0' / 'schemas'
+
+install_data(
+    'autostart.desktop',
+    install_dir: autostartdir,
+    rename: meson.project_name() + '.desktop'
+)
+
+install_data(
+    'compositor-autostart.desktop',
+    install_dir: autostartdir,
+    rename: meson.project_name() + '.compositor.desktop'
+)
+
+install_data(
+    'installer.desktop',
+    install_dir: get_option('datadir') / 'xsessions'
+)
+
+install_data(
+    'installer.session',
+    install_dir: get_option('datadir') / 'gnome-session' / 'sessions'
+)
+
+install_data(
+    'installer-default-settings.gschema.override',
+    install_dir: schemadir
+)
+
+install_subdir(
+    'gsd',
+    install_dir: autostartdir,
+    strip_directory: true
+)