[gnome-boxes] meson: Fix search provider ini file
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] meson: Fix search provider ini file
- Date: Thu, 4 Jan 2018 13:57:32 +0000 (UTC)
commit 33d3c878121a427b93c8416d11cde460be7dfe49
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Tue Jan 2 11:29:24 2018 +0100
meson: Fix search provider ini file
The search provider ini file has two fields `Title` and `Icon` that
are not necessary. These two fields have been removed.
The translation merge process has also been disabled because is not
necessary to translate this file.
https://bugzilla.gnome.org/show_bug.cgi?id=791421
data/Makefile.am | 6 +-----
...ider.ini.in => gnome-boxes-search-provider.ini} | 2 --
data/meson.build | 8 +-------
po/POTFILES.in | 1 -
4 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index b309432..570c5e1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -52,7 +52,7 @@ org.gnome.Boxes.service: org.gnome.Boxes.service.in Makefile
EXTRA_DIST = \
org.gnome.Boxes.desktop.in \
- gnome-boxes-search-provider.ini.in \
+ gnome-boxes-search-provider.ini \
org.gnome.Boxes.service.in \
$(gresource_file) \
$(gsettings_SCHEMAS) \
@@ -76,13 +76,9 @@ DISTCLEANFILES = \
$(NULL)
MAINTAINERCLEANFILES = \
- gnome-boxes-search-provider.ini \
org.gnome.boxes.gschema.valid \
$(NULL)
-gnome-boxes-search-provider.ini: gnome-boxes-search-provider.ini.in
- $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
org.gnome.Boxes.SearchProvider.service: org.gnome.Boxes.SearchProvider.service.in Makefile
$(AM_V_GEN) [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@
diff --git a/data/gnome-boxes-search-provider.ini.in b/data/gnome-boxes-search-provider.ini
similarity index 79%
rename from data/gnome-boxes-search-provider.ini.in
rename to data/gnome-boxes-search-provider.ini
index 568d621..cd89b8c 100644
--- a/data/gnome-boxes-search-provider.ini.in
+++ b/data/gnome-boxes-search-provider.ini
@@ -1,6 +1,4 @@
[Shell Search Provider]
-_Title=Boxes
-Icon=gnome-remote-desktop
DesktopId=org.gnome.Boxes.desktop
BusName=org.gnome.Boxes.SearchProvider
ObjectPath=/org/gnome/Boxes/SearchProvider
diff --git a/data/meson.build b/data/meson.build
index 0bf8bdb..1b5a530 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -39,13 +39,6 @@ custom_target ('appdata-file',
command: [ msgfmt, '--xml', '--template', '@INPUT@', '-d', po_dir, '-o', '@OUTPUT@' ],
)
-configure_file (
- input: 'gnome-boxes-search-provider.ini.in',
- output: 'gnome-boxes-search-provider.ini',
- configuration: configuration_data (),
- install_dir: join_paths (data_dir, 'gnome-shell', 'search-providers'),
-)
-
gsettings_conf = configuration_data ()
gsettings_conf.set ('GETTEXT_PACKAGE', meson.project_name ())
configure_file (
@@ -56,6 +49,7 @@ configure_file (
install_dir: join_paths(data_dir, 'glib-2.0', 'schemas'),
)
+install_data ('gnome-boxes-search-provider.ini', install_dir : join_paths (data_dir, 'gnome-shell',
'search-providers'))
install_data ('QEMU_Session', install_dir : join_paths (data_dir, 'gnome-boxes/sources'))
install_data ('disk.img', install_dir : join_paths (data_dir, 'gnome-boxes/unattended'))
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f9f8574..c8ed07c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
# Please keep this file sorted alphabetically.
data/org.gnome.Boxes.appdata.xml.in
data/org.gnome.Boxes.desktop.in.in
-data/gnome-boxes-search-provider.ini.in
data/org.gnome.boxes.gschema.xml
data/ui/app-window.ui
data/ui/auth-notification.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]