From cfde53e29ada7a375b48d9254c26ebff0ab40cf7 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Thu, 7 Sep 2023 11:43:47 +0200
Subject: Fix gschema file translation

fixes https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/issues/39
---
 data/CMakeLists.txt                                 | 12 +-----------
 data/org.ayatana.indicator.bluetooth.gschema.xml    |  9 +++++++++
 data/org.ayatana.indicator.bluetooth.gschema.xml.in |  9 ---------
 po/POTFILES.in                                      |  2 +-
 4 files changed, 11 insertions(+), 21 deletions(-)
 create mode 100644 data/org.ayatana.indicator.bluetooth.gschema.xml
 delete mode 100644 data/org.ayatana.indicator.bluetooth.gschema.xml.in

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index d3eae13..49ea20c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -63,14 +63,4 @@ install(
 # GSettings
 ###########################
 
-set (SCHEMA_NAME "org.ayatana.indicator.bluetooth.gschema.xml")
-set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
-set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
-
-# generate the .xml file using intltool
-find_package(Intltool REQUIRED)
-set (ENV{LC_ALL} "C")
-intltool_merge_translations("${SCHEMA_FILE_IN}" "${SCHEMA_FILE}" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
-
-# let UseGSettings do the rest
-add_schema (${SCHEMA_NAME})
+add_schema ("org.ayatana.indicator.bluetooth.gschema.xml")
diff --git a/data/org.ayatana.indicator.bluetooth.gschema.xml b/data/org.ayatana.indicator.bluetooth.gschema.xml
new file mode 100644
index 0000000..7862d03
--- /dev/null
+++ b/data/org.ayatana.indicator.bluetooth.gschema.xml
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema id="org.ayatana.indicator.bluetooth" path="/org/ayatana/indicator/bluetooth/">
+    <key name="visible" type="b">
+      <default>true</default>
+      <summary>Bluetooth indicator in the menu bar.</summary>
+      <description>Whether or not to show the Bluetooth indicator in the menu bar.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.ayatana.indicator.bluetooth.gschema.xml.in b/data/org.ayatana.indicator.bluetooth.gschema.xml.in
deleted file mode 100644
index 67eb604..0000000
--- a/data/org.ayatana.indicator.bluetooth.gschema.xml.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<schemalist>
-  <schema id="org.ayatana.indicator.bluetooth" path="/org/ayatana/indicator/bluetooth/">
-    <key name="visible" type="b">
-      <default>true</default>
-      <_summary>Bluetooth indicator in the menu bar.</_summary>
-      <_description>Whether or not to show the Bluetooth indicator in the menu bar.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6f4337a..6178427 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
-data/org.ayatana.indicator.bluetooth.gschema.xml.in
+data/org.ayatana.indicator.bluetooth.gschema.xml
 src/bluetooth.vala
 src/bluez.vala
 src/desktop.vala
-- 
cgit v1.2.3