summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-19 02:22:56 -0800
committerStefano Karapetsas <[email protected]>2012-11-19 02:22:56 -0800
commita10375c2851e8569353c0da9921b8d0d9cbea2e6 (patch)
treeea3db8621842ac2a8ca154a2363db33933449acf
parent57ebf58f977e36e5d0f6ed81ea5c0ee89e1cd720 (diff)
parentdb9135a42865a737bd6bc7477a9aea4b31941ab1 (diff)
downloadmate-calc-a10375c2851e8569353c0da9921b8d0d9cbea2e6.tar.bz2
mate-calc-a10375c2851e8569353c0da9921b8d0d9cbea2e6.tar.xz
Merge pull request #8 from bhull2010/master
Use org.mate.calc as schema id
-rw-r--r--data/Makefile.am4
-rw-r--r--data/org.mate.calc.gschema.xml.in (renamed from data/org.mate.mate-calc.gschema.xml.in)14
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/mate-calc.c2
4 files changed, 11 insertions, 11 deletions
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
@@ -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.mate-calc.gschema.xml.in b/data/org.mate.calc.gschema.xml.in
index 7a834f7..4f0f79b 100644
--- a/data/org.mate.mate-calc.gschema.xml.in
+++ b/data/org.mate.calc.gschema.xml.in
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
- <enum id="org.mate.mate-calc.NumberFormat">
+ <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.mate-calc.ButtonMode">
+ <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.mate-calc.AngleUnit">
+ <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/mate-calc/" id="org.mate.mate-calc" gettext-domain="mate-calc">
+ <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"/>
@@ -46,17 +46,17 @@
<_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">
+ <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.mate-calc.AngleUnit">
+ <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.mate-calc.ButtonMode">
+ <key name="button-mode" enum="org.mate.calc.ButtonMode">
<default>'basic'</default>
<_summary>Button mode</_summary>
<_description>The button mode</_description>
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");