Migrated DConf to GSettings

ibus · Dec 15, 2017 · ae039c7 · ae039c7
1 parent 34e8b0c
commit ae039c7
Show file tree

Hide file tree

Showing 16 changed files with 2,170 additions and 2,348 deletions.
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2010-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2010-2016 Red Hat, Inc.
+# Copyright (c) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2010-2017 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,11 +36,25 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdatadir=$(datadir)/appdata
 @INTLTOOL_XML_RULE@
 
+schemas_in_files = org.freedesktop.ibus.engine.anthy.gschema.xml.in
+schemas_DATA = $(schemas_in_files:.xml.in=.xml)
+schemasdir = $(datadir)/glib-2.0/schemas
+
 CLEANFILES = \
         $(appdata_DATA) \
+        $(schemas_DATA) \
         emoji.t \
         $(NULL)
 
+$(schemas_DATA): $(schemas_in_files)
+	$(SED) -e "s|\@ANTHY_ZIPCODE_FILE\@|$(ANTHY_ZIPCODE_FILE)|g" \
+	       -e "s|\@KASUMI_EXEC_FILE\@|$(KASUMI_EXEC_FILE)|g" \
+	       -e "s|\@KASUMI_ICON_FILE\@|$(KASUMI_ICON_FILE)|g" \
+	       -e "s|\@ON_OFF_KEYS\@|$(ON_OFF_KEYS)|g" \
+	       -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \
+	$< > $@
+
+
 emoji.t: emoji-each.t emoji-emoji.t
 	@echo "Generate $@"; \
 	$(SED) -e '/^#/d' $(srcdir)/emoji-emoji.t > emoji-emoji.t.$$$$; \
@@ -63,6 +77,7 @@ endif
 
 EXTRA_DIST = \
         $(appdata_in_files) \
+        $(schemas_in_files) \
         emoji-each.t \
         emoji-emoji.t \
         era.t \

diff --git a/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in b/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in
diff --git a/engine/python3/Makefile.am b/engine/python3/Makefile.am
@@ -3,8 +3,8 @@
 # ibus-anthy - The Anthy engine for IBus
 #
 # Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2010-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2016 Red Hat, Inc.
+# Copyright (c) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -102,6 +102,7 @@ _config.py: _config.py.in
 	    -e "s|\@LAYOUT\@|$(LAYOUT)|g" \
 	    -e "s|\@SYMBOL_CHAR_INT\@|$(SYMBOL_CHAR_INT)|g" \
 	    -e "s|\@ICON_PREFERENCE\@|$(ICON_PREFERENCE)|g" \
+	    -e "s|\@VERSION\@|$(VERSION)|g" \
 	$< > $@
 
 test:

diff --git a/engine/python3/_config.py.in b/engine/python3/_config.py.in
@@ -4,8 +4,8 @@
 # ibus-anthy - The Anthy engine for IBus
 #
 # Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2010-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2016 Red Hat, Inc.
+# Copyright (c) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,4 +27,5 @@ LOCALEDIR = '@datadir@/locale'
 LAYOUT = '@LAYOUT@'
 SYMBOL_CHAR = chr(@SYMBOL_CHAR_INT@)
 ICON_PREFERENCE = '@ICON_PREFERENCE@'
+VERSION = '@VERSION@'
 DEBUG = False