From db9135a42865a737bd6bc7477a9aea4b31941ab1 Mon Sep 17 00:00:00 2001
From: Brent Hull <bhull2010@live.com>
Date: Sun, 18 Nov 2012 20:06:28 -0500
Subject: Use org.mate.calc as schema id

---
 data/Makefile.am                       |  4 +-
 data/org.mate.calc.gschema.xml.in      | 75 ++++++++++++++++++++++++++++++++++
 data/org.mate.mate-calc.gschema.xml.in | 75 ----------------------------------
 po/POTFILES.in                         |  2 +-
 src/mate-calc.c                        |  2 +-
 5 files changed, 79 insertions(+), 79 deletions(-)
 create mode 100644 data/org.mate.calc.gschema.xml.in
 delete mode 100644 data/org.mate.mate-calc.gschema.xml.in

diff --git a/data/Makefile.am b/data/Makefile.am
index b93b554..35a977a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,7 @@ ui_DATA = \
 	buttons-financial.ui \
 	buttons-programming.ui
 
-gsettings_SCHEMAS = org.mate.mate-calc.gschema.xml
+gsettings_SCHEMAS = org.mate.calc.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
@@ -17,7 +17,7 @@ Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
 
 man1_MANS = mate-calc.1
 
-EXTRA_DIST = $(ui_DATA) org.mate.mate-calc.gschema.xml.in mate-calc.desktop.in $(man1_MANS)
+EXTRA_DIST = $(ui_DATA) org.mate.calc.gschema.xml.in mate-calc.desktop.in $(man1_MANS)
 
 DISTCLEANFILES = \
 	Makefile.in \
diff --git a/data/org.mate.calc.gschema.xml.in b/data/org.mate.calc.gschema.xml.in
new file mode 100644
index 0000000..4f0f79b
--- /dev/null
+++ b/data/org.mate.calc.gschema.xml.in
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <enum id="org.mate.calc.NumberFormat">
+    <value value="0" nick="fixed"/>
+    <value value="1" nick="scientific"/>
+    <value value="2" nick="engineering"/>
+  </enum>
+  <enum id="org.mate.calc.ButtonMode">
+    <value value="0" nick="basic"/>
+    <value value="1" nick="advanced"/>
+    <value value="2" nick="financial"/>
+    <value value="3" nick="programming"/>
+  </enum>
+  <enum id="org.mate.calc.AngleUnit">
+    <value value="0" nick="radians"/>
+    <value value="1" nick="degrees"/>
+    <value value="2" nick="gradians"/>
+  </enum>
+
+  <schema path="/org/mate/calc/" id="org.mate.calc" gettext-domain="mate-calc">
+    <key type="i" name="accuracy">
+      <default>9</default>
+      <range min="0" max="9"/>
+      <_summary>Accuracy value</_summary>
+      <_description>The number of digits displayed after the numeric point</_description>
+    </key>
+    <key type="i" name="word-size">
+      <default>64</default>
+      <range min="8" max="64"/>
+      <_summary>Word size</_summary>
+      <_description>The size of the words used in bitwise operations</_description>
+    </key>
+    <key type="i" name="base">
+      <default>10</default>
+      <range min="2" max="16"/>
+      <_summary>Numeric Base</_summary>
+      <_description>The numeric base</_description>
+    </key>
+    <key type="b" name="show-thousands">
+      <default>false</default>
+      <_summary>Show Thousands Separators</_summary>
+      <_description>Indicates whether thousands separators are shown in large numbers.</_description>
+    </key>
+    <key type="b" name="show-zeroes">
+      <default>false</default>
+      <_summary>Show Trailing Zeroes</_summary>
+      <_description>Indicates whether any trailing zeroes after the  numeric point should be shown in the display value.</_description>
+    </key>
+    <key name="number-format" enum="org.mate.calc.NumberFormat">
+      <default>'fixed'</default>
+      <_summary>Number format</_summary>
+      <_description>The format to display numbers in</_description>
+    </key>
+    <key name="angle-units" enum="org.mate.calc.AngleUnit">
+      <default>'degrees'</default>
+      <_summary>Angle units</_summary>
+      <_description>The angle units to use</_description>
+    </key>
+    <key name="button-mode" enum="org.mate.calc.ButtonMode">
+      <default>'basic'</default>
+      <_summary>Button mode</_summary>
+      <_description>The button mode</_description>
+    </key>
+    <key type="s" name="source-currency">
+      <default>''</default>
+      <_summary>Source currency</_summary>
+      <_description>Currency of the current calculation</_description>
+    </key>
+    <key type="s" name="target-currency">
+      <default>''</default>
+      <_summary>Target currency</_summary>
+      <_description>Currency to convert the current calculation into</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.mate-calc.gschema.xml.in b/data/org.mate.mate-calc.gschema.xml.in
deleted file mode 100644
index 7a834f7..0000000
--- a/data/org.mate.mate-calc.gschema.xml.in
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <enum id="org.mate.mate-calc.NumberFormat">
-    <value value="0" nick="fixed"/>
-    <value value="1" nick="scientific"/>
-    <value value="2" nick="engineering"/>
-  </enum>
-  <enum id="org.mate.mate-calc.ButtonMode">
-    <value value="0" nick="basic"/>
-    <value value="1" nick="advanced"/>
-    <value value="2" nick="financial"/>
-    <value value="3" nick="programming"/>
-  </enum>
-  <enum id="org.mate.mate-calc.AngleUnit">
-    <value value="0" nick="radians"/>
-    <value value="1" nick="degrees"/>
-    <value value="2" nick="gradians"/>
-  </enum>
-
-  <schema path="/org/mate/mate-calc/" id="org.mate.mate-calc" gettext-domain="mate-calc">
-    <key type="i" name="accuracy">
-      <default>9</default>
-      <range min="0" max="9"/>
-      <_summary>Accuracy value</_summary>
-      <_description>The number of digits displayed after the numeric point</_description>
-    </key>
-    <key type="i" name="word-size">
-      <default>64</default>
-      <range min="8" max="64"/>
-      <_summary>Word size</_summary>
-      <_description>The size of the words used in bitwise operations</_description>
-    </key>
-    <key type="i" name="base">
-      <default>10</default>
-      <range min="2" max="16"/>
-      <_summary>Numeric Base</_summary>
-      <_description>The numeric base</_description>
-    </key>
-    <key type="b" name="show-thousands">
-      <default>false</default>
-      <_summary>Show Thousands Separators</_summary>
-      <_description>Indicates whether thousands separators are shown in large numbers.</_description>
-    </key>
-    <key type="b" name="show-zeroes">
-      <default>false</default>
-      <_summary>Show Trailing Zeroes</_summary>
-      <_description>Indicates whether any trailing zeroes after the  numeric point should be shown in the display value.</_description>
-    </key>
-    <key name="number-format" enum="org.mate.mate-calc.NumberFormat">
-      <default>'fixed'</default>
-      <_summary>Number format</_summary>
-      <_description>The format to display numbers in</_description>
-    </key>
-    <key name="angle-units" enum="org.mate.mate-calc.AngleUnit">
-      <default>'degrees'</default>
-      <_summary>Angle units</_summary>
-      <_description>The angle units to use</_description>
-    </key>
-    <key name="button-mode" enum="org.mate.mate-calc.ButtonMode">
-      <default>'basic'</default>
-      <_summary>Button mode</_summary>
-      <_description>The button mode</_description>
-    </key>
-    <key type="s" name="source-currency">
-      <default>''</default>
-      <_summary>Source currency</_summary>
-      <_description>Currency of the current calculation</_description>
-    </key>
-    <key type="s" name="target-currency">
-      <default>''</default>
-      <_summary>Target currency</_summary>
-      <_description>Currency to convert the current calculation into</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d684647..8113669 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,7 @@
 [type: gettext/glade]data/buttons-programming.ui
 [type: gettext/glade]data/preferences.ui
 data/mate-calc.desktop.in
-data/org.mate.mate-calc.gschema.xml.in
+data/org.mate.calc.gschema.xml.in
 src/currency.c
 src/currency.h
 src/financial.c
diff --git a/src/mate-calc.c b/src/mate-calc.c
index c8499d4..c5439af 100644
--- a/src/mate-calc.c
+++ b/src/mate-calc.c
@@ -222,7 +222,7 @@ main(int argc, char **argv)
 
     get_options(argc, argv);
 
-    settings = g_settings_new ("org.mate.mate-calc");
+    settings = g_settings_new ("org.mate.calc");
     accuracy = g_settings_get_int(settings, "accuracy");
     word_size = g_settings_get_int(settings, "word-size");
     base = g_settings_get_int(settings, "base");
-- 
cgit v1.2.1