From 8818b2d64a4e2a3ddea3ed94c62ea8404f7c1fa8 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 11 Sep 2022 13:11:06 +0200
Subject: Fix translating the indicator's .gschema.xml file.

---
 data/CMakeLists.txt                                |  3 ---
 data/org.ayatana.indicator.keyboard.gschema.xml    | 19 +++++++++++++++++++
 data/org.ayatana.indicator.keyboard.gschema.xml.in | 19 -------------------
 po/POTFILES.in                                     |  1 +
 4 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 data/org.ayatana.indicator.keyboard.gschema.xml
 delete mode 100644 data/org.ayatana.indicator.keyboard.gschema.xml.in

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 35bbfd54..662ca716 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -56,8 +56,5 @@ install(FILES 50-org.ayatana.indicator.keyboard.AccountsService.pkla DESTINATION
 
 # org.ayatana.indicator.keyboard.gschema.xml
 
-find_package (Intltool REQUIRED)
-set (ENV{LC_ALL} "C")
-intltool_merge_translations ("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicator.keyboard.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.indicator.keyboard.gschema.xml" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
 find_package (GSettings REQUIRED)
 add_schema ("org.ayatana.indicator.keyboard.gschema.xml")
diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml b/data/org.ayatana.indicator.keyboard.gschema.xml
new file mode 100644
index 00000000..67a50765
--- /dev/null
+++ b/data/org.ayatana.indicator.keyboard.gschema.xml
@@ -0,0 +1,19 @@
+<schemalist>
+    <schema gettext-domain="ayatana-indicator-keyboard" id="org.ayatana.indicator.keyboard" path="/org/ayatana/indicator/keyboard/">
+        <key name="language-icon-desktop" type="b">
+            <default>true</default>
+            <summary>Show the language icon in desktop mode.</summary>
+            <description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</description>
+        </key>
+        <key name="language-icon-phone" type="b">
+            <default>false</default>
+            <summary>Show the language icon in phone mode.</summary>
+            <description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</description>
+        </key>
+        <key name="language-icon-greeter" type="b">
+            <default>false</default>
+            <summary>Show the language icon in the greeter.</summary>
+            <description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</description>
+        </key>
+    </schema>
+</schemalist>
diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml.in b/data/org.ayatana.indicator.keyboard.gschema.xml.in
deleted file mode 100644
index e80a89e9..00000000
--- a/data/org.ayatana.indicator.keyboard.gschema.xml.in
+++ /dev/null
@@ -1,19 +0,0 @@
-<schemalist>
-    <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.ayatana.indicator.keyboard" path="/org/ayatana/indicator/keyboard/">
-        <key name="language-icon-desktop" type="b">
-            <default>true</default>
-            <_summary>Show the language icon in desktop mode.</_summary>
-            <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description>
-        </key>
-        <key name="language-icon-phone" type="b">
-            <default>false</default>
-            <_summary>Show the language icon in phone mode.</_summary>
-            <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description>
-        </key>
-        <key name="language-icon-greeter" type="b">
-            <default>false</default>
-            <_summary>Show the language icon in the greeter.</_summary>
-            <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description>
-        </key>
-    </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 56552034..8dd4f062 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+data/org.ayatana.indicator.keyboard.gschema.xml
 src/main.c
 src/keyboard-lomiri.c
 src/keyboard-x11.c
-- 
cgit v1.2.3