diff --git a/data/meson.build b/data/meson.build index 87b52ce54..2146ce5bf 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,5 @@ desktop_files = [ 'org.gnome.Shell.desktop', - 'org.gnome.Extensions.desktop', ] service_files = [] @@ -43,7 +42,6 @@ endforeach subdir('dbus-interfaces') -subdir('icons') subdir('theme') data_resources = [ diff --git a/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg b/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg rename to js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg diff --git a/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg b/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg rename to js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg diff --git a/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg b/js/extensionPrefs/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg similarity index 100% rename from data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg rename to js/extensionPrefs/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg diff --git a/data/icons/meson.build b/js/extensionPrefs/data/icons/meson.build similarity index 100% rename from data/icons/meson.build rename to js/extensionPrefs/data/icons/meson.build diff --git a/js/extensionPrefs/data/meson.build b/js/extensionPrefs/data/meson.build index 424d14410..2f43ae180 100644 --- a/js/extensionPrefs/data/meson.build +++ b/js/extensionPrefs/data/meson.build @@ -5,3 +5,25 @@ gnome.compile_resources( install: true, install_dir: pkgdatadir ) + +desktopconf = configuration_data() +# We substitute in bindir so it works as an autostart +# file when built in a non-system prefix +desktopconf.set('bindir', bindir) +desktopconf.set('app_id', app_id) +desktopconf.set('prgname', prgname) + +i18n.merge_file('desktop', + input: configure_file( + input: app_id + '.desktop.in.in', + output: app_id + '.desktop.in', + configuration: desktopconf + ), + output: app_id + '.desktop', + po_dir: po_dir, + install: true, + install_dir: desktopdir, + type: 'desktop' +) + +subdir('icons') diff --git a/data/org.gnome.Extensions.desktop.in.in b/js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in similarity index 75% rename from data/org.gnome.Extensions.desktop.in.in rename to js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in index 008fe1d73..2806c795e 100644 --- a/data/org.gnome.Extensions.desktop.in.in +++ b/js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in @@ -2,8 +2,8 @@ Type=Application Name=Extensions # Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=org.gnome.Extensions +Icon=@app_id@ Comment=Configure GNOME Shell Extensions -Exec=@bindir@/gnome-shell-extension-prefs %u +Exec=@bindir@/@prgname@ %u Categories=GNOME;GTK; OnlyShowIn=GNOME; diff --git a/po/POTFILES.in b/po/POTFILES.in index e72dc7e26..4cb847888 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,10 +1,10 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. data/50-gnome-shell-system.xml -data/org.gnome.Extensions.desktop.in.in data/org.gnome.Shell.desktop.in.in data/org.gnome.shell.gschema.xml.in data/org.gnome.Shell.PortalHelper.desktop.in.in +js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in js/extensionPrefs/js/main.js js/extensionPrefs/data/ui/extension-row.ui js/extensionPrefs/data/ui/extensions-window.ui