Skip to content

Commit ae039c7

Browse files
fujiwaratfujiwarat
committed
Migrated DConf to GSettings
1 parent 34e8b0c commit ae039c7

File tree

16 files changed

+2170
-2348
lines changed

16 files changed

+2170
-2348
lines changed

‎data/Makefile.am‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#
33
# ibus-anthy - The Anthy engine for IBus
44
#
5-
# Copyright (c) 2010-2016 Takao Fujiwara <[email protected]>
6-
# Copyright (c) 2010-2016 Red Hat, Inc.
5+
# Copyright (c) 2010-2017 Takao Fujiwara <[email protected]>
6+
# Copyright (c) 2010-2017 Red Hat, Inc.
77
#
88
# This program is free software; you can redistribute it and/or modify
99
# 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)
3636
appdatadir=$(datadir)/appdata
3737
@INTLTOOL_XML_RULE@
3838

39+
schemas_in_files = org.freedesktop.ibus.engine.anthy.gschema.xml.in
40+
schemas_DATA = $(schemas_in_files:.xml.in=.xml)
41+
schemasdir = $(datadir)/glib-2.0/schemas
42+
3943
CLEANFILES = \
4044
$(appdata_DATA) \
45+
$(schemas_DATA) \
4146
emoji.t \
4247
$(NULL)
4348

49+
$(schemas_DATA): $(schemas_in_files)
50+
$(SED) -e "s|\@ANTHY_ZIPCODE_FILE\@|$(ANTHY_ZIPCODE_FILE)|g" \
51+
-e "s|\@KASUMI_EXEC_FILE\@|$(KASUMI_EXEC_FILE)|g" \
52+
-e "s|\@KASUMI_ICON_FILE\@|$(KASUMI_ICON_FILE)|g" \
53+
-e "s|\@ON_OFF_KEYS\@|$(ON_OFF_KEYS)|g" \
54+
-e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \
55+
$< > $@
56+
57+
4458
emoji.t: emoji-each.t emoji-emoji.t
4559
@echo "Generate $@"; \
4660
$(SED) -e '/^#/d' $(srcdir)/emoji-emoji.t > emoji-emoji.t.$$$$; \
@@ -63,6 +77,7 @@ endif
6377

6478
EXTRA_DIST = \
6579
$(appdata_in_files) \
80+
$(schemas_in_files) \
6681
emoji-each.t \
6782
emoji-emoji.t \
6883
era.t \

‎data/org.freedesktop.ibus.engine.anthy.gschema.xml.in‎

Lines changed: 1111 additions & 0 deletions
Large diffs are not rendered by default.

‎engine/python3/Makefile.am‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# ibus-anthy - The Anthy engine for IBus
44
#
55
# Copyright (c) 2007-2008 Peng Huang <[email protected]>
6-
# Copyright (c) 2010-2016 Takao Fujiwara <[email protected]>
7-
# Copyright (c) 2007-2016 Red Hat, Inc.
6+
# Copyright (c) 2010-2017 Takao Fujiwara <[email protected]>
7+
# Copyright (c) 2007-2017 Red Hat, Inc.
88
#
99
# This program is free software; you can redistribute it and/or modify
1010
# it under the terms of the GNU General Public License as published by
@@ -102,6 +102,7 @@ _config.py: _config.py.in
102102
-e "s|\@LAYOUT\@|$(LAYOUT)|g" \
103103
-e "s|\@SYMBOL_CHAR_INT\@|$(SYMBOL_CHAR_INT)|g" \
104104
-e "s|\@ICON_PREFERENCE\@|$(ICON_PREFERENCE)|g" \
105+
-e "s|\@VERSION\@|$(VERSION)|g" \
105106
$< > $@
106107

107108
test:

‎engine/python3/_config.py.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# ibus-anthy - The Anthy engine for IBus
55
#
66
# Copyright (c) 2007-2008 Peng Huang <[email protected]>
7-
# Copyright (c) 2010-2016 Takao Fujiwara <[email protected]>
8-
# Copyright (c) 2007-2016 Red Hat, Inc.
7+
# Copyright (c) 2010-2017 Takao Fujiwara <[email protected]>
8+
# Copyright (c) 2007-2017 Red Hat, Inc.
99
#
1010
# This program is free software; you can redistribute it and/or modify
1111
# it under the terms of the GNU General Public License as published by
@@ -27,4 +27,5 @@ LOCALEDIR = '@datadir@/locale'
2727
LAYOUT = '@LAYOUT@'
2828
SYMBOL_CHAR = chr(@SYMBOL_CHAR_INT@)
2929
ICON_PREFERENCE = '@ICON_PREFERENCE@'
30+
VERSION = '@VERSION@'
3031
DEBUG = False

0 commit comments

Comments
 (0)