[gnome-system-monitor] Fix gschema validation error caused by missing file
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor] Fix gschema validation error caused by missing file
- Date: Wed, 24 Jan 2018 00:54:31 +0000 (UTC)
commit 079391447ca01ba5f1ab71a478505af813b32e4b
Author: Ting-Wei Lan <lantw src gnome org>
Date: Sun Jan 21 00:11:12 2018 +0800
Fix gschema validation error caused by missing file
We cannot and should not merge translations into gschema files.
https://bugzilla.gnome.org/show_bug.cgi?id=790570
configure.ac | 2 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 3 +--
... org.gnome.gnome-system-monitor.gschema.xml.in} | 0
4 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e13c156..42045ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,7 +131,7 @@ Makefile
scripts/Makefile
src/Makefile
src/legacy/Makefile
-src/org.gnome.gnome-system-monitor.gschema.xml.in
+src/org.gnome.gnome-system-monitor.gschema.xml
po/Makefile.in
help/Makefile
gnome-system-monitor.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5b0af79..3153f4e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,7 +23,7 @@ src/lsof.cpp
src/main.cpp
src/memmaps.cpp
src/openfiles.cpp
-src/org.gnome.gnome-system-monitor.gschema.xml.in.in
+src/org.gnome.gnome-system-monitor.gschema.xml.in
src/prefsdialog.cpp
src/procactions.cpp
src/procdialogs.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index aaa2745..33fc292 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,8 +55,7 @@ LDADD = \
# GSettings schemas, enum files and conversion file
gsettings_ENUM_NAMESPACE = org.gnome.gnome-system-monitor
gsettings_ENUM_FILES = $(top_srcdir)/src/*.h $(top_srcdir)/src/legacy/*.h
-gsettings_in_file = org.gnome.gnome-system-monitor.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+gsettings_SCHEMAS = org.gnome.gnome-system-monitor.gschema.xml
@GSETTINGS_RULES@
dist_noinst_DATA = \
diff --git a/src/org.gnome.gnome-system-monitor.gschema.xml.in.in
b/src/org.gnome.gnome-system-monitor.gschema.xml.in
similarity index 100%
rename from src/org.gnome.gnome-system-monitor.gschema.xml.in.in
rename to src/org.gnome.gnome-system-monitor.gschema.xml.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]