diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch index 62781ab..65b51f2 100644 --- a/ibus-HEAD.patch +++ b/ibus-HEAD.patch @@ -710,6 +710,876 @@ index 4ebff8da..01c43b0d 100644 -- 2.17.1 +From a8e8b694dcb52e4beb367dff1e8ecaaca4f63c00 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Wed, 3 Oct 2018 17:01:59 +0900 +Subject: [PATCH] data/dconf: Delete dconf dependencies + +gsettings-schema-convert has not worked with python3 since GConf +has been deprecated since 2011 so we cannot disable python2 +in canse GConf is enabled. +I don't wish to maintain both ibus.schemas.in and +org.freedesktop.ibus.gschema.xml.in and now decide to delete +whole the GConf builds. +gsettings is now stable and can be used instead. +ibus-dconf will be deperecated in the near future. + +BUG=https://bugzilla.gnome.org/show_bug.cgi?id=759334 +--- + conf/Makefile.am | 9 +- + configure.ac | 29 --- + data/Makefile.am | 25 +- + data/dconf/Makefile.am | 6 - + .../dconf/org.freedesktop.ibus.gschema.xml | 225 ++++++++++++++++++ + 5 files changed, 227 insertions(+), 67 deletions(-) + create mode 100644 data/dconf/org.freedesktop.ibus.gschema.xml + +diff --git a/conf/Makefile.am b/conf/Makefile.am +index efa86499..26f6e2ab 100644 +--- a/conf/Makefile.am ++++ b/conf/Makefile.am +@@ -3,7 +3,7 @@ + # ibus - The Input Bus + # + # Copyright (c) 2007-2010 Peng Huang +-# Copyright (c) 2007-2010 Red Hat, Inc. ++# Copyright (c) 2007-2018 Red Hat, Inc. + # + # This library is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public +@@ -20,12 +20,6 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + # USA + +-if ENABLE_GCONF +-GCONF_DIR = \ +- gconf \ +- $(NULL) +-endif +- + MEMCONF_DIR = \ + memconf \ + $(NULL) +@@ -38,7 +32,6 @@ endif + + SUBDIRS = \ + $(DCONF_DIR) \ +- $(GCONF_DIR) \ + $(MEMCONF_DIR) \ + $(NULL) + +diff --git a/configure.ac b/configure.ac +index 4b6a7a21..0e9337a7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -339,33 +339,6 @@ PKG_CHECK_MODULES(DBUS, [ + dbus-1 + ]) + +-# --enable-gconf option. +-AC_ARG_ENABLE(gconf, +- AS_HELP_STRING([--enable-gconf], +- [Use GConf code]), +- [enable_gconf=$enableval], +- [enable_gconf=no] +-) +-AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"]) +- +-if test x"$enable_gconf" = x"yes"; then +- # check gconf +- PKG_CHECK_MODULES(GCONF, +- [gconf-2.0 >= 2.12], +- ) +- +- AC_PATH_PROG(GCONFTOOL, gconftool-2, no) +- if test x"$GCONFTOOL" = xno; then +- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) +- fi +- +- AM_GCONF_SOURCE_2 +- # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2 +-else +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) +- enable_gconf="no (disabled, use --enable-gconf to enable)" +-fi +- + # --enable-memconf option. + AC_ARG_ENABLE(memconf, + AS_HELP_STRING([--enable-memconf], +@@ -771,7 +744,6 @@ bindings/Makefile + bindings/pygobject/Makefile + bindings/vala/Makefile + conf/Makefile +-conf/gconf/Makefile + conf/dconf/Makefile + conf/memconf/Makefile + tools/Makefile +@@ -798,7 +770,6 @@ Build options: + Build appindicator support $enable_appindicator + Build appindicator engine icon $enable_appindicator_engine_icon + Build python library $enable_python_library +- Build gconf modules $enable_gconf + Build memconf modules $enable_memconf + Build dconf modules $enable_dconf + Build introspection $found_introspection +diff --git a/data/Makefile.am b/data/Makefile.am +index d9d613fe..2533f444 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -3,7 +3,7 @@ + # ibus - The Input Bus + # + # Copyright (c) 2007-2016 Peng Huang +-# Copyright (c) 2007-2016 Red Hat, Inc. ++# Copyright (c) 2007-2018 Red Hat, Inc. + # + # This library is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public +@@ -30,27 +30,4 @@ if ENABLE_DCONF + SUBDIRS += dconf + endif + +-schemasdir = $(GCONF_SCHEMA_FILE_DIR) +-schemas_in_files = ibus.schemas.in +-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) +-@INTLTOOL_SCHEMAS_RULE@ +- +-install-data-local: +-if GCONF_SCHEMAS_INSTALL +- if test -z "$(DESTDIR)" ; then \ +- for p in $(schemas_DATA) ; do \ +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \ +- --makefile-install-rule $(top_builddir)/data/$$p >&1 > /dev/null; \ +- done \ +- fi +-endif +- +-EXTRA_DIST = \ +- $(schemas_in_files) \ +- $(NULL) +- +-DISTCLEANFILES = \ +- $(schemas_DATA) \ +- $(NULL) +- + -include $(top_srcdir)/git.mk +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 433d9937..4ac1e3a6 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -34,11 +34,6 @@ dconfprofile_DATA = profile/ibus + dconfdbdir = $(sysconfdir)/dconf/db/ibus.d + dconfdb_DATA = 00-upstream-settings + +-org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in +- $(AM_V_GEN) gsettings-schema-convert --force --gconf --xml \ +- --schema-id "org.freedesktop.ibus" \ +- --output $@ $< +- + 00-upstream-settings: $(srcdir)/make-dconf-override-db.sh | $(gsettings_SCHEMAS) + @$(MKDIR_P) db + $(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh > $@ || \ +@@ -75,7 +70,6 @@ CLEANFILES = \ + $(NULL) + + MAINTAINERCLEANFILES = \ +- $(gsettings_schemas_in_files) \ + 00-upstream-settings \ + $(NULL) + +diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml +new file mode 100644 +index 00000000..cbe7118e +--- /dev/null ++++ b/data/dconf/org.freedesktop.ibus.gschema.xml +@@ -0,0 +1,225 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ [] ++ Preload engines ++ Preload engines during ibus starts up ++ ++ ++ [] ++ Engines order ++ Saved engines order in input method list ++ ++ ++ 400 ++ Popup delay milliseconds for IME switcher window ++ Set popup delay milliseconds to show IME switcher window. The default is 400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show the window and switch prev/next engines. ++ ++ ++ '' ++ Saved version number ++ The saved version number will be used to check the difference between the version of the previous installed ibus and one of the current ibus. ++ ++ ++ [ 'ara', 'bg', 'cz', 'dev', 'gr', 'gur', 'in', 'jp(kana)', 'mal', 'mkd', 'ru', 'ua' ] ++ Latin layouts which have no ASCII ++ US layout is appended to the Latin layouts. variant can be omitted. ++ ++ ++ true ++ Use xmodmap ++ Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched. ++ ++ ++ false ++ Use system keyboard layout ++ Use system keyboard (XKB) layout ++ ++ ++ true ++ Embed Preedit Text ++ Embed Preedit Text in Application Window ++ ++ ++ true ++ Use global input method ++ Share the same input method among all applications ++ ++ ++ false ++ Enable input method by default ++ Enable input method by default when the application gets input focus ++ ++ ++ [ '/desktop/ibus/engine/pinyin', '/desktop/ibus/engine/bopomofo', '/desktop/ibus/engine/hangul' ] ++ DConf preserve name prefixes ++ Prefixes of DConf keys to stop name conversion ++ ++ ++ ++ ++ ++ [ 'Control+space', 'Zenkaku_Hankaku', 'Alt+Kanji', 'Alt+grave', 'Hangul', 'Alt+Release+Alt_R' ] ++ Trigger shortcut keys ++ The shortcut keys for turning input method on or off ++ ++ ++ [ '<Super>space' ] ++ Trigger shortcut keys for gtk_accelerator_parse ++ The shortcut keys for turning input method on or off ++ ++ ++ [] ++ Enable shortcut keys ++ The shortcut keys for turning input method on ++ ++ ++ [] ++ Disable shortcut keys ++ The shortcut keys for turning input method off ++ ++ ++ [ 'Alt+Shift_L' ] ++ Next engine shortcut keys ++ The shortcut keys for switching to the next input method in the list ++ ++ ++ [ 'Alt+Shift_L' ] ++ Next engine shortcut keys ++ The shortcut keys for switching to the next input method in the list ++ ++ ++ [] ++ Prev engine shortcut keys ++ The shortcut keys for switching to the previous input method ++ ++ ++ [] ++ Prev engine shortcut keys ++ The shortcut keys for switching to the previous input method ++ ++ ++ ++ ++ 0 ++ Auto hide ++ The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show ++ ++ ++ -1 ++ Language panel position ++ ++ ++ -1 ++ Language panel position ++ ++ ++ false ++ Follow the input cursor in case the panel is always shown ++ If true, the panel follows the input cursor in case the panel is always shown. If false, the panel is shown at a fixed location. ++ ++ ++ 10000 ++ The milliseconds to show property panel ++ The milliseconds to show property panel after focus-in or properties are changed. ++ ++ ++ 1 ++ Orientation of lookup table ++ Orientation of lookup table. 0 = Horizontal, 1 = Vertical ++ ++ ++ true ++ Show icon on system tray ++ Show icon on system tray ++ ++ ++ false ++ Show input method name ++ Show input method name on language bar ++ ++ ++ '#415099' ++ RGBA value of XKB icon ++ XKB icon shows the layout string and the string is rendered with the RGBA value. The RGBA value can be 1. a color name from X11, 2. a hex value in form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or percentage values in the range 0% to 100%, and 'a' is a floating point value in the range 0 to 1 of the alpha. ++ ++ ++ 500 ++ The milliseconds to show the panel icon for a property ++ The milliseconds to show the panel icon from the engine icon to a property icon whenever engines are switched if the property is specified by the value of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the property icon is shown immediately. ++ ++ ++ false ++ Use custom font ++ Use custom font name for language panel ++ ++ ++ 'Sans 10' ++ Custom font ++ Custom font name for language panel ++ ++ ++ ++ ++ ++ [ '<Control><Shift>u' ] ++ Unicode shortcut keys for gtk_accelerator_parse ++ The shortcut keys for turning Unicode typing on or off ++ ++ ++ [ '<Control><Shift>e' ] ++ Emoji shortcut keys for gtk_accelerator_parse ++ The shortcut keys for turning emoji typing on or off ++ ++ ++ 'Monospace 16' ++ Custom font ++ Custom font name for emoji characters on emoji dialog ++ ++ ++ 'en' ++ Default language for emoji dictionary ++ Choose a default language of emoji dictionaries on the emoji dialog. The value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ++ ++ ++ [] ++ favorite emoji list on emoji dialog ++ You can show the favorite emojis on emoji list if this list has any characters. ++ ++ ++ [] ++ favorite emoji annotation list on emoji dialog ++ You can assign an annotation for a favorite emoji in this list. ++ ++ ++ false ++ Whether emoji annotations can be match partially or not ++ Whether emoji annotations can be matched with a partial string instead of the exact match or not. ++ ++ ++ 3 ++ Match emoji annotations with the specified length ++ Match emoji annotations partially with more than the specified number of characters instead of the exact match. ++ ++ ++ 0 ++ Choose a condition to match emoji annotations partially ++ Choose one of the following conditions to match emoji annotations partially: 0 == Prefix match, 1 == Suffix match, 2 == Containing match ++ ++ ++ true ++ Load the emoji data at the time of startup ++ Load the emoji data at the time of startup if true. About 10MB memory is needed to load the data. Load the emoji data when open the emoji dialog at the beginning if false. ++ ++ ++ false ++ Load the Unicode data at the time of startup ++ Load the Unicode data at the time of startup if true. About 15MB memory is needed to load the data. Load the Unicode data when open the emoji dialog at the beginning if false. The Unicode data is always loaded after the emoji data is loaded even if true. ++ ++ ++ +-- +2.20.1 + +From 74a00cc93ba99367e175ad3d3415e585d453d17f Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 16 Oct 2018 18:17:41 +0900 +Subject: [PATCH] data/dconf: Rename org.freedesktop.ibus.gschema.xml[.in] + +--- + data/dconf/Makefile.am | 7 ++----- + 1 files changed, 2 insertions(+), 5 deletions(-) + rename data/dconf/{org.freedesktop.ibus.gschema.xml.in => org.freedesktop.ibus.gschema.xml} (100%) + +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 4ac1e3a6..5360f033 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -21,12 +21,10 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + # USA + +-gsettings_schemas_in_files = org.freedesktop.ibus.gschema.xml.in +-gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml) ++gsettings_SCHEMAS = org.freedesktop.ibus.gschema.xml + gsettingsconvertdir = $(datadir)/GConf/gsettings + dist_gsettingsconvert_DATA = ibus.convert + @GSETTINGS_RULES@ +-@INTLTOOL_XML_NOMERGE_RULE@ + + dconfprofiledir = $(sysconfdir)/dconf/profile + dconfprofile_DATA = profile/ibus +@@ -56,7 +54,7 @@ install-data-hook: + fi + + EXTRA_DIST = \ +- $(gsettings_schemas_in_files) \ ++ $(gsettings_SCHEMAS) \ + $(man_5_in_files) \ + make-dconf-override-db.sh \ + profile/ibus \ +@@ -64,7 +62,6 @@ EXTRA_DIST = \ + $(NULL) + + CLEANFILES = \ +- $(gsettings_SCHEMAS) \ + $(man_5_DATA) \ + $(man_5_files) \ + $(NULL) +-- +2.20.1 + +From a6710817b3d29d6a522f108f96ffe64d2f5367fe Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 16 Oct 2018 19:46:01 +0900 +Subject: [PATCH] Gettext migration for gschema.xml file + +https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration +--- + bindings/vala/config.vapi | 2 +- + configure.ac | 9 ++- + data/dconf/org.freedesktop.ibus.gschema.xml | 2 +- + po/Makevars | 8 ++- + po/POTFILES.in | 10 +-- + setup/Makefile.am | 14 ++-- + ...us-setup.desktop.in => ibus-setup.desktop} | 0 + src/ibusutil.c | 2 +- + src/keyname-table.h | 70 +------------------ + tools/main.vala | 2 +- + ui/gtk3/Makefile.am | 20 +++--- + ui/gtk3/application.vala | 3 +- + ui/gtk3/emojierapp.vala | 3 +- + ui/gtk3/extension.vala | 3 +- + ...p.in.in => ibus-extension-gtk3.desktop.in} | 0 + ...sktop.in.in => ibus-ui-emojier.desktop.in} | 0 + 16 files changed, 40 insertions(+), 108 deletions(-) + rename setup/{ibus-setup.desktop.in => ibus-setup.desktop} (100%) + rename ui/gtk3/{ibus-extension-gtk3.desktop.in.in => ibus-extension-gtk3.desktop.in} (100%) + rename ui/gtk3/{ibus-ui-emojier.desktop.in.in => ibus-ui-emojier.desktop.in} (100%) + +diff --git a/bindings/vala/config.vapi b/bindings/vala/config.vapi +index e3c43dfb..45ab61b0 100644 +--- a/bindings/vala/config.vapi ++++ b/bindings/vala/config.vapi +@@ -9,5 +9,5 @@ namespace Config + public const string PKGDATADIR; + public const string LIBEXECDIR; + public const string GETTEXT_PACKAGE; +- public const string GLIB_LOCALE_DIR; ++ public const string LOCALEDIR; + } +diff --git a/configure.ac b/configure.ac +index 0e9337a7..26a048c8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -111,9 +111,8 @@ GETTEXT_PACKAGE=ibus10 + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The prefix for out gettext translation domains.]) +-GLIB_DEFINE_LOCALEDIR(GLIB_LOCALE_DIR) +-GLIB_LOCALE_DIR=$localedir +-AC_SUBST(GLIB_LOCALE_DIR) ++AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir", ++ [Define the location where the catalogs will be installed]) + + # For dislpay date. + m4_define(ibus_datedisplay, +@@ -131,14 +130,14 @@ AC_PROG_INSTALL + AC_PROG_MAKE_SET + + # i18n stuff +-AM_GLIB_GNU_GETTEXT ++AM_GNU_GETTEXT_VERSION([0.19.8]) ++AM_GNU_GETTEXT([external]) + + # Define PACKAGE_VERSION_* variables. + AM_DISABLE_STATIC + AC_ISC_POSIX + AC_HEADER_STDC + LT_INIT +-IT_PROG_INTLTOOL([0.35.0]) + + # Check functions. + AC_CHECK_FUNCS(daemon) +diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml +index cbe7118e..8724a8ba 100644 +--- a/data/dconf/org.freedesktop.ibus.gschema.xml ++++ b/data/dconf/org.freedesktop.ibus.gschema.xml +@@ -1,4 +1,4 @@ +- ++ + + + +diff --git a/po/Makevars b/po/Makevars +index 3e56bea1..8cf0b78a 100644 +--- a/po/Makevars ++++ b/po/Makevars +@@ -8,7 +8,9 @@ subdir = po + top_builddir = .. + + # These options get passed to xgettext. +-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ ++# The last argument --keyword without keyword prevents xgettext from ++# extracting translatable strings from "Icon" in *.desktop files. ++XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --keyword=Name --keyword=Comment --keyword --add-comments + + # This is the copyright holder that gets inserted into the header of the + # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +@@ -39,3 +41,7 @@ MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT) + # This is the list of locale categories, beyond LC_MESSAGES, for which the + # message catalogs shall be used. It is usually empty. + EXTRA_LOCALE_CATEGORIES = ++ ++# https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration ++PO_DEPENDS_ON_POT = "no" ++DIST_DEPENDS_ON_UPDAE_PO = "no" +diff --git a/po/POTFILES.in b/po/POTFILES.in +index c81292d2..b3b71e81 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,11 +1,10 @@ + # Files with translatable strings. + # Please keep this file in alphabetical order. +-[type: gettext/glade]setup/setup.ui + bus/dbusimpl.c + bus/engineproxy.c + bus/inputcontext.c + bus/panelproxy.c +-data/ibus.schemas.in ++data/dconf/org.freedesktop.ibus.gschema.xml + ibus/__init__.py + ibus/_config.py.in + ibus/_gtk.py +@@ -36,9 +35,10 @@ setup/engineabout.py + setup/enginecombobox.py + setup/enginedialog.py + setup/enginetreeview.py +-setup/ibus-setup.desktop.in ++setup/ibus-setup.desktop + setup/keyboardshortcut.py + setup/main.py ++setup/setup.ui + src/ibusbus.c + src/ibusconfig.c + src/ibusemojigen.h +@@ -61,8 +61,8 @@ ui/gtk3/candidatepanel.vala + ui/gtk3/emojier.vala + ui/gtk3/emojierapp.vala + ui/gtk3/handle.vala +-ui/gtk3/ibus-extension-gtk3.desktop.in.in +-ui/gtk3/ibus-ui-emojier.desktop.in.in ++ui/gtk3/ibus-extension-gtk3.desktop.in ++ui/gtk3/ibus-ui-emojier.desktop.in + ui/gtk3/iconwidget.vala + ui/gtk3/keybindingmanager.vala + ui/gtk3/panel.vala +diff --git a/setup/Makefile.am b/setup/Makefile.am +index b7dd7554..17d80c51 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -3,8 +3,8 @@ + # ibus - The Input Bus + # + # Copyright (c) 2007-2014 Peng Huang +-# Copyright (c) 2015-2017 Takao Fujiwara +-# Copyright (c) 2007-2017 Red Hat, Inc. ++# Copyright (c) 2015-2018 Takao Fujiwara ++# Copyright (c) 2007-2018 Red Hat, Inc. + # + # This library is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public +@@ -40,10 +40,8 @@ ibussetup_DATA = \ + bin_SCRIPTS = ibus-setup + ibussetupdir = $(pkgdatadir)/setup + +-desktop_in_files = ibus-setup.desktop.in +-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) ++desktop_DATA = ibus-setup.desktop + desktopdir = $(datadir)/applications +-@INTLTOOL_DESKTOP_RULE@ + + man_one_in_files = ibus-setup.1.in + man_one_files = $(man_one_in_files:.1.in=.1) +@@ -67,11 +65,7 @@ EXTRA_DIST = \ + $(man_one_in_files) \ + ibus-setup.in \ + setup.ui \ +- ibus-setup.desktop.in \ +- $(NULL) +- +-DISTCLEANFILES = \ +- $(desktop_DATA) \ ++ ibus-setup.desktop \ + $(NULL) + + test: +diff --git a/setup/ibus-setup.desktop.in b/setup/ibus-setup.desktop +similarity index 100% +rename from setup/ibus-setup.desktop.in +rename to setup/ibus-setup.desktop +diff --git a/src/ibusutil.c b/src/ibusutil.c +index 3c6f9247..15e36f80 100644 +--- a/src/ibusutil.c ++++ b/src/ibusutil.c +@@ -99,7 +99,7 @@ _load_lang() + struct stat buf; + + #ifdef ENABLE_NLS +- bindtextdomain ("iso_639", GLIB_LOCALE_DIR); ++ bindtextdomain ("iso_639", LOCALEDIR); + bind_textdomain_codeset ("iso_639", "UTF-8"); + #endif + +diff --git a/src/keyname-table.h b/src/keyname-table.h +index 5d133226..f84ecdc3 100644 +--- a/src/keyname-table.h ++++ b/src/keyname-table.h +@@ -6830,6 +6830,9 @@ static const gdk_key gdk_keys_by_name[] = { + #if 0 + + /* ++ * xgettext extracts strings in '#if 0' against intltool and I deleted ++ * all the translatable strings here. ++ * + * Translators, the strings in the “keyboard label” context are + * display names for keyboard keys. Some of them have prefixes like + * XF86 or ISO_ - these should be removed in the translation. Similarly, +@@ -6840,72 +6843,5 @@ static const gdk_key gdk_keys_by_name[] = { + * Scroll_lock - Scroll lock + * KP_Space - Space (keypad) + */ +-NC_("keyboard label", "BackSpace") +-NC_("keyboard label", "Tab") +-NC_("keyboard label", "Return") +-NC_("keyboard label", "Pause") +-NC_("keyboard label", "Scroll_Lock") +-NC_("keyboard label", "Sys_Req") +-NC_("keyboard label", "Escape") +-NC_("keyboard label", "Multi_key") +-NC_("keyboard label", "Home") +-NC_("keyboard label", "Left") +-NC_("keyboard label", "Up") +-NC_("keyboard label", "Right") +-NC_("keyboard label", "Down") +-NC_("keyboard label", "Page_Up") +-NC_("keyboard label", "Page_Down") +-NC_("keyboard label", "End") +-NC_("keyboard label", "Begin") +-NC_("keyboard label", "Print") +-NC_("keyboard label", "Insert") +-NC_("keyboard label", "Num_Lock") +-/* Translators: KP_ means 'key pad' here */ +-NC_("keyboard label", "KP_Space") +-NC_("keyboard label", "KP_Tab") +-NC_("keyboard label", "KP_Enter") +-NC_("keyboard label", "KP_Home") +-NC_("keyboard label", "KP_Left") +-NC_("keyboard label", "KP_Up") +-NC_("keyboard label", "KP_Right") +-NC_("keyboard label", "KP_Down") +-NC_("keyboard label", "KP_Page_Up") +-NC_("keyboard label", "KP_Prior") +-NC_("keyboard label", "KP_Page_Down") +-NC_("keyboard label", "KP_Next") +-NC_("keyboard label", "KP_End") +-NC_("keyboard label", "KP_Begin") +-NC_("keyboard label", "KP_Insert") +-NC_("keyboard label", "KP_Delete") +-NC_("keyboard label", "Delete") +-NC_("keyboard label", "MonBrightnessUp") +-NC_("keyboard label", "MonBrightnessDown") +-NC_("keyboard label", "KbdBrightnessUp") +-NC_("keyboard label", "KbdBrightnessDown") +-NC_("keyboard label", "AudioMute") +-NC_("keyboard label", "AudioMicMute") +-NC_("keyboard label", "AudioLowerVolume") +-NC_("keyboard label", "AudioRaiseVolume") +-NC_("keyboard label", "AudioPlay") +-NC_("keyboard label", "AudioStop") +-NC_("keyboard label", "AudioNext") +-NC_("keyboard label", "AudioPrev") +-NC_("keyboard label", "AudioRecord") +-NC_("keyboard label", "AudioPause") +-NC_("keyboard label", "AudioRewind") +-NC_("keyboard label", "AudioMedia") +-NC_("keyboard label", "ScreenSaver") +-NC_("keyboard label", "Battery") +-NC_("keyboard label", "Launch1") +-NC_("keyboard label", "Forward") +-NC_("keyboard label", "Back") +-NC_("keyboard label", "Sleep") +-NC_("keyboard label", "Hibernate") +-NC_("keyboard label", "WLAN") +-NC_("keyboard label", "WebCam") +-NC_("keyboard label", "Display") +-NC_("keyboard label", "TouchpadToggle") +-NC_("keyboard label", "WakeUp") +-NC_("keyboard label", "Suspend") + + #endif +diff --git a/tools/main.vala b/tools/main.vala +index 6e201f30..bf9c0fc9 100644 +--- a/tools/main.vala ++++ b/tools/main.vala +@@ -472,7 +472,7 @@ void print_usage(FileStream stream) { + + public int main(string[] argv) { + GLib.Intl.setlocale(GLib.LocaleCategory.ALL, ""); +- GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.GLIB_LOCALE_DIR); ++ GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR); + GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8"); + GLib.Intl.textdomain(Config.GETTEXT_PACKAGE); + +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index 6ebc96ce..e40971f1 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -165,8 +165,8 @@ EXTRA_DIST = \ + gtkpanel.xml.in \ + notification-item.xml \ + notification-watcher.xml \ +- ibus-ui-emojier.desktop.in.in \ +- ibus-extension-gtk3.desktop.in.in \ ++ ibus-ui-emojier.desktop.in \ ++ ibus-extension-gtk3.desktop.in \ + panelbinding.vala \ + $(NULL) + +@@ -265,32 +265,32 @@ man_sevendir = $(mandir)/man7 + %.7.gz: %.7 + $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + +-desktop_in_in_files = \ +- ibus-ui-emojier.desktop.in.in \ +- ibus-extension-gtk3.desktop.in.in \ ++desktop_in_files = \ ++ ibus-ui-emojier.desktop.in \ ++ ibus-extension-gtk3.desktop.in \ + $(NULL) +-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) ++desktop_notrans_files = $(desktop_in_files:.desktop.in=.desktop) + desktop_DATA = \ + org.freedesktop.IBus.Panel.Emojier.desktop \ + org.freedesktop.IBus.Panel.Extension.Gtk3.desktop \ + $(NULL) + desktopdir = $(datadir)/applications +-%.desktop.in: %.desktop.in.in ++%.desktop: %.desktop.in + $(AM_V_GEN) sed \ + -e 's|^_Name=|Name=|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \ + mv $@.tmp $@ + $(NULL) +-org.freedesktop.IBus.Panel.Emojier.desktop: ibus-ui-emojier.desktop.in ++org.freedesktop.IBus.Panel.Emojier.desktop: ibus-ui-emojier.desktop + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + $(NULL) +-org.freedesktop.IBus.Panel.Extension.Gtk3.desktop: ibus-extension-gtk3.desktop.in ++org.freedesktop.IBus.Panel.Extension.Gtk3.desktop: ibus-extension-gtk3.desktop + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + $(NULL) + + CLEANFILES += \ + $(desktop_DATA) \ +- $(desktop_in_files) \ ++ $(desktop_notrans_files) \ + $(man_seven_DATA) \ + $(man_seven_files) \ + $(NULL) +diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala +index 806b4b22..cc9ee54c 100644 +--- a/ui/gtk3/application.vala ++++ b/ui/gtk3/application.vala +@@ -26,8 +26,7 @@ class Application { + private Panel m_panel; + + public Application(string[] argv) { +- GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, +- Config.GLIB_LOCALE_DIR); ++ GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR); + GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8"); + IBus.init(); + Gtk.init(ref argv); +diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala +index fab99d9e..e8331989 100644 +--- a/ui/gtk3/emojierapp.vala ++++ b/ui/gtk3/emojierapp.vala +@@ -227,8 +227,7 @@ public class EmojiApplication : Gtk.Application { + + + public static int main (string[] args) { +- GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, +- Config.GLIB_LOCALE_DIR); ++ GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR); + GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8"); + GLib.Intl.textdomain(Config.GETTEXT_PACKAGE); + +diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala +index c729fd7e..ea3cd464 100644 +--- a/ui/gtk3/extension.vala ++++ b/ui/gtk3/extension.vala +@@ -28,8 +28,7 @@ class ExtensionGtk : Gtk.Application { + public ExtensionGtk(string[] args) { + Object(application_id: "org.freedesktop.IBus.Panel.Extension.Gtk3", + flags: ApplicationFlags.FLAGS_NONE); +- GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, +- Config.GLIB_LOCALE_DIR); ++ GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR); + GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8"); + IBus.init(); + Gtk.init(ref args); +diff --git a/ui/gtk3/ibus-extension-gtk3.desktop.in.in b/ui/gtk3/ibus-extension-gtk3.desktop.in +similarity index 100% +rename from ui/gtk3/ibus-extension-gtk3.desktop.in.in +rename to ui/gtk3/ibus-extension-gtk3.desktop.in +diff --git a/ui/gtk3/ibus-ui-emojier.desktop.in.in b/ui/gtk3/ibus-ui-emojier.desktop.in +similarity index 100% +rename from ui/gtk3/ibus-ui-emojier.desktop.in.in +rename to ui/gtk3/ibus-ui-emojier.desktop.in +-- +2.20.1 + From c1b55431c076dfa3fc26a3a998bfcf729e9ba602 Mon Sep 17 00:00:00 2001 From: fujiwarat Date: Fri, 26 Oct 2018 18:44:35 +0900 @@ -848,6 +1718,95 @@ index d7f96ea3..ab39e9f2 100755 -- 2.17.1 +From aa24a526dd7dec9a719e063fb35da90afb5dc5bf Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Fri, 26 Oct 2018 19:01:19 +0900 +Subject: [PATCH] src/tests: Fix the location of + org.freedesktop.ibus.gschema.xml + +The location has been changed since xgettext migration. +--- + src/tests/runtest | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/tests/runtest b/src/tests/runtest +index ab39e9f2..4e980c71 100755 +--- a/src/tests/runtest ++++ b/src/tests/runtest +@@ -103,8 +103,8 @@ for t in $DISABLE_GUI_TESTS; do + done + + # IBusEngine has GSettings +-if test ! -f "$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" ; then +- echo "NOT FOUND $top_builddir/data/dconf/$IBUS_SCHEMA_FILE" ++if test ! -f "$top_srcdir/data/dconf/$IBUS_SCHEMA_FILE" ; then ++ echo "NOT FOUND $top_srcdir/data/dconf/$IBUS_SCHEMA_FILE" + exit -1 + fi + +@@ -148,7 +148,7 @@ run_test_case() + export GTK_IM_MODULE_FILE + $GTK_QUERY_MODULE "$IM_IBUS_SO" > $GTK_IM_MODULE_FILE + +- cp "../$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" $PWD ++ cp "../$top_srcdir/data/dconf/$IBUS_SCHEMA_FILE" $PWD + glib-compile-schemas $PWD + if test $? -ne 0 ; then + echo "FAILED glib-compile-schemas" +-- +2.20.1 + +From 3914d3a2b1aeda8779b2d8a9d91088802530b3a9 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 30 Oct 2018 11:54:52 +0900 +Subject: [PATCH] data/dconf: Add comments in org.freedesktop.ibus.gschema.xml + +--- + data/dconf/org.freedesktop.ibus.gschema.xml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml +index 8724a8ba..5938d3b8 100644 +--- a/data/dconf/org.freedesktop.ibus.gschema.xml ++++ b/data/dconf/org.freedesktop.ibus.gschema.xml +@@ -7,7 +7,9 @@ + + + [] ++ + Preload engines ++ + Preload engines during ibus starts up + + +-- +2.20.1 + +From b6086665bcf12914e6e1ac99b606dc6dee363f26 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 30 Oct 2018 11:57:19 +0900 +Subject: [PATCH] data/dconf: Fix a typo + +--- + data/dconf/org.freedesktop.ibus.gschema.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml +index 5938d3b8..7ae8f0f6 100644 +--- a/data/dconf/org.freedesktop.ibus.gschema.xml ++++ b/data/dconf/org.freedesktop.ibus.gschema.xml +@@ -7,7 +7,7 @@ + + + [] +- ++ + Preload engines + + Preload engines during ibus starts up +-- +2.20.1 + From 3172c3b23faefe76b3b7adfc75f9be34a0fb2e02 Mon Sep 17 00:00:00 2001 From: fujiwarat Date: Wed, 31 Oct 2018 17:42:38 +0900 @@ -2050,6 +3009,55 @@ index ed7fea6e..ab7ff88a 100644 -- 2.19.1 +From a78e7f8deb51f01125325da868c8fc75f0436b3e Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Mon, 17 Dec 2018 20:10:34 +0900 +Subject: [PATCH] configure: Generate ibus_localedir variable + +--- + configure.ac | 3 ++- + m4/ibuslocale.m4 | 15 +++++++++++++++ + 2 files changed, 17 insertions(+), 1 deletion(-) + create mode 100644 m4/ibuslocale.m4 + +diff --git a/configure.ac b/configure.ac +index 26a048c8..8fc76239 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -111,7 +111,8 @@ GETTEXT_PACKAGE=ibus10 + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The prefix for out gettext translation domains.]) +-AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir", ++DEFINE_IBUS_LOCALEDIR ++AC_DEFINE_UNQUOTED(LOCALEDIR, "$ibus_localedir", + [Define the location where the catalogs will be installed]) + + # For dislpay date. +diff --git a/m4/ibuslocale.m4 b/m4/ibuslocale.m4 +new file mode 100644 +index 00000000..d0f45cfb +--- /dev/null ++++ b/m4/ibuslocale.m4 +@@ -0,0 +1,15 @@ ++AC_DEFUN([DEFINE_IBUS_LOCALEDIR], [ ++ibus_save_prefix="$prefix" ++ibus_save_datarootdir="$datarootdir" ++ibus_save_datadir="$datadir" ++ibus_save_localedir="$localedir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++datarootdir=`eval echo "$datarootdir"` ++datadir=`eval echo "$datadir"` ++test "x$localedir" = xNONE && localedir="${datadir}/locale" ++ibus_localedir=`eval echo "$localedir"` ++localedir="$ibus_save_localedir" ++datadir="$ibus_save_datadir" ++datarootdir="$ibus_save_datarootdir" ++prefix="$ibus_save_prefix" ++]) +-- +2.20.1 + From 1cd5254811259befe50c8bd81584d1bfe2c63ed0 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Mon, 17 Dec 2018 20:20:11 +0900 @@ -2130,9 +3138,9 @@ index 15e36f80..fd1da006 100644 struct stat buf; #ifdef ENABLE_NLS -- bindtextdomain ("iso_639", GLIB_LOCALE_DIR); +- bindtextdomain ("iso_639", LOCALEDIR); - bind_textdomain_codeset ("iso_639", "UTF-8"); -+ bindtextdomain ("iso_639-3", GLIB_LOCALE_DIR); ++ bindtextdomain ("iso_639-3", LOCALEDIR); + bind_textdomain_codeset ("iso_639-3", "UTF-8"); #endif @@ -2156,6 +3164,39 @@ index 15e36f80..fd1da006 100644 -- 2.19.1 +From 7b9c034f570bb1bf89569a01b98d6771b1596722 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Mon, 17 Dec 2018 20:26:32 +0900 +Subject: [PATCH] m4: Add ibuslocale.m4 to Makefile.am + +--- + m4/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/m4/Makefile.am b/m4/Makefile.am +index 57e00807..dcf84ac3 100644 +--- a/m4/Makefile.am ++++ b/m4/Makefile.am +@@ -3,7 +3,7 @@ + # ibus - The Input Bus + # + # Copyright (c) 2007-2010 Peng Huang +-# Copyright (c) 2007-2010 Red Hat, Inc. ++# Copyright (c) 2007-2018 Red Hat, Inc. + # + # This library is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public +@@ -22,6 +22,7 @@ + + EXTRA_DIST = \ + as-version.m4 \ ++ ibuslocale.m4 \ + vapigen.m4 \ + $(NULL) + +-- +2.20.1 + From 9ae2d4658fff3d1e7262fb4fb7ca9ce1af0a27ec Mon Sep 17 00:00:00 2001 From: fujiwarat Date: Thu, 20 Dec 2018 16:40:31 +0900 @@ -2800,3 +3841,280 @@ index f35d7a58..4445c254 100644 -- 2.19.1 +From 4d3a8ff3d0bf69508551e65ae2dae676919a728d Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Wed, 13 Feb 2019 16:00:42 +0900 +Subject: [PATCH] Delete Super-space notification + +I'd assume most IBus 1.5.2 users are migrated to the latest 1.5.z now +but the notification dialog gives much attention and could be deprecated. + +BUG=https://github.com/ibus/ibus/issues/2080 +--- + configure.ac | 20 ++------------------ + ui/gtk3/Makefile.am | 19 ++----------------- + ui/gtk3/panel.vala | 28 +--------------------------- + 3 files changed, 5 insertions(+), 62 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 77823c3c..0790d994 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,8 +3,8 @@ + # ibus - The Input Bus + # + # Copyright (c) 2007-2016 Peng Huang +-# Copyright (c) 2015-2018 Takao Fujiwara +-# Copyright (c) 2007-2018 Red Hat, Inc. ++# Copyright (c) 2015-2019 Takao Fujiwara ++# Copyright (c) 2007-2019 Red Hat, Inc. + # + # This library is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public +@@ -588,21 +588,6 @@ if test x"$enable_engine" = x"yes"; then + enable_engine="yes (enabled, use --disable-engine to disable)" + fi + +-# --disable-libnotify +-AC_ARG_ENABLE(libnotify, +- AS_HELP_STRING([--disable-libnotify], +- [Disable to link libnotify]), +- [enable_libnotify=$enableval], +- [enable_libnotify=yes] +-) +-AM_CONDITIONAL([ENABLE_LIBNOTIFY], [test x"$enable_libnotify" = x"yes"]) +-if test x"$enable_libnotify" = x"yes"; then +- PKG_CHECK_MODULES(LIBNOTIFY, [ +- libnotify >= 0.7 +- ]) +- enable_libnotify="yes (enabled, use --disable-libnotify to disable)" +-fi +- + PKG_CHECK_MODULES(XTEST, + [x11 xtst], + [enable_xtest=yes], +@@ -782,7 +767,6 @@ Build options: + No snooper regexes "$NO_SNOOPER_APPS" + Panel icon "$IBUS_ICON_KEYBOARD" + Enable surrounding-text $enable_surrounding_text +- Enable libnotify $enable_libnotify + Enable Emoji dict $enable_emoji_dict + Unicode Emoji directory $UNICODE_EMOJI_DIR + CLDR annotation directory $EMOJI_ANNOTATION_DIR +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index e40971f1..d0fa7c58 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -3,8 +3,8 @@ + # ibus - The Input Bus + # + # Copyright (c) 2007-2015 Peng Huang +-# Copyright (c) 2015-2018 Takao Fujwiara +-# Copyright (c) 2007-2018 Red Hat, Inc. ++# Copyright (c) 2015-2019 Takao Fujwiara ++# Copyright (c) 2007-2019 Red Hat, Inc. + # + # This library is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public +@@ -81,21 +81,6 @@ AM_VALAFLAGS = \ + --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ + $(NULL) + +-if ENABLE_LIBNOTIFY +-AM_CFLAGS += \ +- @LIBNOTIFY_CFLAGS@ \ +- $(NULL) +- +-AM_LDADD += \ +- @LIBNOTIFY_LIBS@ \ +- $(NULL) +- +-AM_VALAFLAGS += \ +- --pkg=libnotify \ +- -D ENABLE_LIBNOTIFY \ +- $(NULL) +-endif +- + if ENABLE_APPINDICATOR + AM_VALAFLAGS += --define=INDICATOR + endif +diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala +index 4c3b00ca..2054658e 100644 +--- a/ui/gtk3/panel.vala ++++ b/ui/gtk3/panel.vala +@@ -3,7 +3,7 @@ + * ibus - The Input Bus + * + * Copyright(c) 2011-2014 Peng Huang +- * Copyright(c) 2015-2018 Takao Fujwiara ++ * Copyright(c) 2015-2019 Takao Fujwiara + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -700,29 +700,6 @@ class Panel : IBus.PanelService { + return -1; + } + +- private void update_version_1_5_3() { +-#if ENABLE_LIBNOTIFY +- if (!Notify.is_initted()) { +- Notify.init ("ibus"); +- } +- +- var notification = new Notify.Notification( +- _("IBus Update"), +- _("Super+space is now the default hotkey."), +- "ibus"); +- notification.set_timeout(30 * 1000); +- notification.set_category("hotkey"); +- +- try { +- notification.show(); +- } catch (GLib.Error e){ +- warning ("Notification is failed for IBus 1.5.3: %s", e.message); +- } +-#else +- warning(_("Super+space is now the default hotkey.")); +-#endif +- } +- + private void update_version_1_5_8() { + inited_engines_order = false; + } +@@ -731,9 +708,6 @@ class Panel : IBus.PanelService { + string prev_version = m_settings_general.get_string("version"); + string current_version = null; + +- if (compare_versions(prev_version, "1.5.3") < 0) +- update_version_1_5_3(); +- + if (compare_versions(prev_version, "1.5.8") < 0) + update_version_1_5_8(); + +-- +2.20.1 + +From b30eb5de95413c3977899fdddd04de6872dae991 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Fri, 22 Feb 2019 18:40:14 +0900 +Subject: [PATCH] Delete underscore in _Name in *.desktop for gettext migration + +--- + po/Makevars | 2 +- + setup/Makefile.am | 26 +++++++++++++++----------- + setup/ibus-setup.desktop | 4 ++-- + ui/gtk3/Makefile.am | 1 - + ui/gtk3/ibus-extension-gtk3.desktop.in | 2 +- + ui/gtk3/ibus-ui-emojier.desktop.in | 2 +- + 6 files changed, 20 insertions(+), 17 deletions(-) + +diff --git a/po/Makevars b/po/Makevars +index 8cf0b78a..d3fbeab2 100644 +--- a/po/Makevars ++++ b/po/Makevars +@@ -1,7 +1,7 @@ + # Makefile variables for PO directory in any package using GNU gettext. + + # Usually the message domain is the same as the package name. +-DOMAIN = $(PACKAGE) ++DOMAIN = $(shell grep "GETTEXT_PACKAGE.*=" $(top_srcdir)/configure.ac | sed -e 's/\(.*\)=[ ]*\(.*\)/\2/') + + # These two variables depend on the location of this directory. + subdir = po +diff --git a/setup/Makefile.am b/setup/Makefile.am +index 17d80c51..cb4dd8d1 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -40,8 +40,11 @@ ibussetup_DATA = \ + bin_SCRIPTS = ibus-setup + ibussetupdir = $(pkgdatadir)/setup + +-desktop_DATA = ibus-setup.desktop ++desktop_notrans_files = ibus-setup.desktop ++desktop_DATA = org.freedesktop.IBus.Setup.desktop + desktopdir = $(datadir)/applications ++org.freedesktop.IBus.Setup.desktop: ibus-setup.desktop ++ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + + man_one_in_files = ibus-setup.1.in + man_one_files = $(man_one_in_files:.1.in=.1) +@@ -55,18 +58,19 @@ man_onedir = $(mandir)/man1 + $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + CLEANFILES = \ +- $(man_one_DATA) \ +- $(man_one_files) \ +- *.pyc \ +- ibus-setup \ +- $(NULL) ++ $(desktop_DATA) \ ++ $(man_one_DATA) \ ++ $(man_one_files) \ ++ *.pyc \ ++ ibus-setup \ ++ $(NULL) + + EXTRA_DIST = \ +- $(man_one_in_files) \ +- ibus-setup.in \ +- setup.ui \ +- ibus-setup.desktop \ +- $(NULL) ++ $(desktop_notrans_files) \ ++ $(man_one_in_files) \ ++ ibus-setup.in \ ++ setup.ui \ ++ $(NULL) + + test: + $(ENV_IBUS_TEST) \ +diff --git a/setup/ibus-setup.desktop b/setup/ibus-setup.desktop +index 864b026e..0608a68f 100644 +--- a/setup/ibus-setup.desktop ++++ b/setup/ibus-setup.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] +-_Name=IBus Preferences +-_Comment=Set IBus Preferences ++Name=IBus Preferences ++Comment=Set IBus Preferences + Exec=ibus-setup + Icon=ibus-setup + Terminal=false +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index d0fa7c58..60205aa5 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -262,7 +262,6 @@ desktop_DATA = \ + desktopdir = $(datadir)/applications + %.desktop: %.desktop.in + $(AM_V_GEN) sed \ +- -e 's|^_Name=|Name=|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \ + mv $@.tmp $@ + $(NULL) +diff --git a/ui/gtk3/ibus-extension-gtk3.desktop.in b/ui/gtk3/ibus-extension-gtk3.desktop.in +index a119ec8e..5e0e910d 100644 +--- a/ui/gtk3/ibus-extension-gtk3.desktop.in ++++ b/ui/gtk3/ibus-extension-gtk3.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-_Name=Emoji Choice ++Name=Emoji Choice + Icon=ibus + Exec=@libexecdir@/ibus-extension-gtk3 + Type=Application +diff --git a/ui/gtk3/ibus-ui-emojier.desktop.in b/ui/gtk3/ibus-ui-emojier.desktop.in +index 6d9422d5..f65fe3d8 100644 +--- a/ui/gtk3/ibus-ui-emojier.desktop.in ++++ b/ui/gtk3/ibus-ui-emojier.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-_Name=Emoji Choice ++Name=Emoji Choice + Icon=ibus + Exec=ibus emoji + Type=Application +-- +2.20.1 +