summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--caribou/settings/setting_types.py11
-rwxr-xr-xtools/make_schema.py3
2 files changed, 4 insertions, 10 deletions
diff --git a/caribou/settings/setting_types.py b/caribou/settings/setting_types.py
index c4af2a6..f6a0503 100644
--- a/caribou/settings/setting_types.py
+++ b/caribou/settings/setting_types.py
@@ -107,8 +107,8 @@ class ValueSetting(Setting):
return bool(self.value)
@property
- def default_value(self):
- return "%r" % self.value
+ def gvariant(self):
+ return GLib.Variant(self.variant_type, self.value)
class BooleanSetting(ValueSetting):
variant_type = 'b'
@@ -117,13 +117,6 @@ class BooleanSetting(ValueSetting):
# Almost anything could be a boolean.
return bool(val)
- @property
- def default_value(self):
- if self.value:
- return "true"
- else:
- return "false"
-
class IntegerSetting(ValueSetting):
variant_type = 'i'
entry_type = ENTRY_SPIN
diff --git a/tools/make_schema.py b/tools/make_schema.py
index 8a6303e..a6d070f 100755
--- a/tools/make_schema.py
+++ b/tools/make_schema.py
@@ -57,7 +57,8 @@ class SchemasMaker:
key.setAttribute('type', setting.variant_type)
schemalist.appendChild(key)
self._append_children_element_value_pairs(
- doc, key, [('default', setting.default_value),
+ doc, key, [('default',
+ getattr(setting.gvariant, "print")(False)),
('_summary', setting.short_desc),
('_description', setting.long_desc)])