Commit 47ede71e authored by Osamu Aoki's avatar Osamu Aoki

New upstream version 1.5.14

parent 60bf9afb
(Apply to data/annotations/en.xml)
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
Unicode Data Files include all data files under the directories
http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF
online code charts under the directory http://www.unicode.org/Public/.
Software includes any source code published in the Unicode Standard or under
the directories http://www.unicode.org/Public/,
http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
NOTICE TO USER: Carefully read the following legal agreement. BY
DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES
("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND
AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF
YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA
FILES OR SOFTWARE.
COPYRIGHT AND PERMISSION NOTICE
Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under
the Terms of Use in http://www.unicode.org/copyright.html.
Permission is hereby granted, free of charge, to any person obtaining a
copy of the Unicode data files and any associated documentation (the "Data
Files") or Unicode software and any associated documentation (the "Software")
to deal in the Data Files or Software without restriction, including without
limitation the rights to use, copy, modify, merge, publish, distribute, and/or
sell copies of the Data Files or Software, and to permit persons to whom the
Data Files or Software are furnished to do so, provided that (a) the above
copyright notice(s) and this permission notice appear with all copies of the
Data Files or Software, (b) both the above copyright notice(s) and this
permission notice appear in associated documentation, and (c) there is clear
notice in each modified Data File or in the Software as well as in the
documentation associated with the Data File(s) or Software that the data or
software has been modified.
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE
DATA FILES OR SOFTWARE.
Except as contained in this notice, the name of a copyright holder shall
not be used in advertising or otherwise to promote the sale, use or other
dealings in these Data Files or Software without prior written authorization
of the copyright holder.
This diff is collapsed.
......@@ -2,8 +2,8 @@
#
# ibus - The Input Bus
#
# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2010 Red Hat, Inc.
# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2016 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
......@@ -69,6 +69,7 @@ pkgconfig_DATA = ibus-@IBUS_API_VERSION@.pc
ibus_pc_in = ibus-@IBUS_API_VERSION@.pc.in
EXTRA_DIST = \
COPYING.unicode \
autogen.sh \
$(ibus_pc_in) \
ibus.spec.in \
......@@ -89,17 +90,24 @@ install-data-hook:
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--disable-schemas-install \
--disable-introspection \
$(NULL)
dist-hook:
if test -d .git ; then \
git log --name-status --date=iso > $(distdir)/ChangeLog ; \
IBUS_PREV_MICRO_VERSION=`expr $(IBUS_MICRO_VERSION) - 1`; \
IBUS_PREV_VERSION=\
"$(IBUS_MAJOR_VERSION).$(IBUS_MINOR_VERSION).$$IBUS_PREV_MICRO_VERSION"; \
echo "Changes in IBus $(IBUS_VERSION)" > $(distdir)/NEWS; \
echo "" >> $(distdir)/NEWS; \
git log $$IBUS_PREV_VERSION...$(IBUS_VERSION) --reverse \
--pretty=format:'%s (%an) %h' >> $(distdir)/NEWS; \
fi
distclean-local:
if test "x$(srcdir)" = "x."; then :; else \
rm -f ChangeLog; \
rm -f NEWS; \
fi
MAINTAINERCLEANFILES = \
......
......@@ -18,8 +18,8 @@
#
# ibus - The Input Bus
#
# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2010 Red Hat, Inc.
# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2016 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
......@@ -218,7 +218,7 @@ DIST_SUBDIRS = src bindings util conf client tools data m4 po docs \
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/ibus-1.0.pc.in $(srcdir)/ibus.spec.in AUTHORS \
COPYING ChangeLog INSTALL NEWS README compile config.guess \
config.sub install-sh ltmain.sh missing
config.sub install-sh ltmain.sh missing py-compile
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -295,6 +295,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMOJI_JSON_FILE = @EMOJI_JSON_FILE@
ENV_IBUS_TEST = @ENV_IBUS_TEST@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
......@@ -374,6 +375,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
ISOCODES_LIBS = @ISOCODES_LIBS@
ISOCODES_PREFIX = @ISOCODES_PREFIX@
JSON_GLIB1_CFLAGS = @JSON_GLIB1_CFLAGS@
JSON_GLIB1_LIBS = @JSON_GLIB1_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
......@@ -385,6 +388,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
......@@ -441,6 +445,7 @@ WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
WAYLAND_LIBS = @WAYLAND_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
X11_PREFIX = @X11_PREFIX@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......@@ -536,6 +541,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ibus-@IBUS_API_VERSION@.pc
ibus_pc_in = ibus-@IBUS_API_VERSION@.pc.in
EXTRA_DIST = \
COPYING.unicode \
autogen.sh \
$(ibus_pc_in) \
ibus.spec.in \
......@@ -553,7 +559,6 @@ DISTCLEANFILES = \
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--disable-schemas-install \
--disable-introspection \
$(NULL)
MAINTAINERCLEANFILES = \
......@@ -1102,11 +1107,19 @@ install-data-hook:
dist-hook:
if test -d .git ; then \
git log --name-status --date=iso > $(distdir)/ChangeLog ; \
IBUS_PREV_MICRO_VERSION=`expr $(IBUS_MICRO_VERSION) - 1`; \
IBUS_PREV_VERSION=\
"$(IBUS_MAJOR_VERSION).$(IBUS_MINOR_VERSION).$$IBUS_PREV_MICRO_VERSION"; \
echo "Changes in IBus $(IBUS_VERSION)" > $(distdir)/NEWS; \
echo "" >> $(distdir)/NEWS; \
git log $$IBUS_PREV_VERSION...$(IBUS_VERSION) --reverse \
--pretty=format:'%s (%an) %h' >> $(distdir)/NEWS; \
fi
distclean-local:
if test "x$(srcdir)" = "x."; then :; else \
rm -f ChangeLog; \
rm -f NEWS; \
fi
rpm: dist @PACKAGE_NAME@.spec
......
Changes in IBus 1.5.14
Don't warn if DISPLAY is not set (Matthias Clasen) 0432aa6
Install a DBus service file (Rui Matos) 84c18f1
configure: don't hardcode pkg-config (Marc-Antoine Perennou) b210c0d
conf/gconf: Fix SEGV in ibus_config_gconf_get_values (fujiwarat) a186059
client/gtk2: Fix SEGV with Wayland display (fujiwarat) 3ef21fe
ui/gtk3: Fix panel CSS format for GTK 3.20 (fujiwarat) a598ae2
engine: Implement Emoji typing with XKB engines (fujiwarat) 160d3c9
engine: Add emoji-list.html (fujiwarat) 0ed644c
engine: Use annotations/en.xml from unocode.org but not emoji-list.html (fujiwarat) 0ee1896
Fix typo in configure.ac (fujiwarat) f88c487
tests/ibus-engine-switch: Don't try to remove non-existing GSource (fujiwarat) 20068d9
Fix make dist (fujiwarat) eee7a13
Fix Croatian language code in simple.xml (fujiwarat) 028624f
Replace deprecated GSimpleAsyncResult with GTask since GLib 2.46 (fujiwarat) 239d363
Release 1.5.14 (fujiwarat) c3ceed4
\ No newline at end of file
This diff is collapsed.
......@@ -240,6 +240,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMOJI_JSON_FILE = @EMOJI_JSON_FILE@
ENV_IBUS_TEST = @ENV_IBUS_TEST@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
......@@ -319,6 +320,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
ISOCODES_LIBS = @ISOCODES_LIBS@
ISOCODES_PREFIX = @ISOCODES_PREFIX@
JSON_GLIB1_CFLAGS = @JSON_GLIB1_CFLAGS@
JSON_GLIB1_LIBS = @JSON_GLIB1_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
......@@ -330,6 +333,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
......@@ -386,6 +390,7 @@ WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
WAYLAND_LIBS = @WAYLAND_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
X11_PREFIX = @X11_PREFIX@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......
......@@ -3,7 +3,7 @@
# ibus - The Input Bus
#
# Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
# Copyright (c) 2014 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2014-2016 Peng Huang <shawn.p.huang@gmail.com>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
......@@ -39,10 +39,12 @@ if ENABLE_TESTS
TESTS += test-override-ibus.py
endif
# IBus.Keymap() accesses keymap files
TESTS_ENVIRONMENT = \
PYTHONPATH=$(top_srcdir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH \
GI_TYPELIB_PATH=$(top_builddir)/src:$$GI_TYPELIB_PATH \
IBUS_KEYMAP_PATH=$(top_srcdir)/data/keymaps \
$(NULL)
LOG_COMPILER = $(PYTHON) -B
......
......@@ -19,7 +19,7 @@
# ibus - The Input Bus
#
# Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
# Copyright (c) 2014 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2014-2016 Peng Huang <shawn.p.huang@gmail.com>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
......@@ -395,6 +395,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMOJI_JSON_FILE = @EMOJI_JSON_FILE@
ENV_IBUS_TEST = @ENV_IBUS_TEST@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
......@@ -474,6 +475,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
ISOCODES_LIBS = @ISOCODES_LIBS@
ISOCODES_PREFIX = @ISOCODES_PREFIX@
JSON_GLIB1_CFLAGS = @JSON_GLIB1_CFLAGS@
JSON_GLIB1_LIBS = @JSON_GLIB1_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
......@@ -485,6 +488,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
......@@ -541,6 +545,7 @@ WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
WAYLAND_LIBS = @WAYLAND_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
X11_PREFIX = @X11_PREFIX@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......@@ -617,10 +622,13 @@ overrides_PYTHON = \
$(NULL)
TESTS = $(am__append_1)
# IBus.Keymap() accesses keymap files
TESTS_ENVIRONMENT = \
PYTHONPATH=$(top_srcdir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH \
GI_TYPELIB_PATH=$(top_builddir)/src:$$GI_TYPELIB_PATH \
IBUS_KEYMAP_PATH=$(top_srcdir)/data/keymaps \
$(NULL)
LOG_COMPILER = $(PYTHON) -B
......
......@@ -2,8 +2,8 @@
#
# ibus - The Input Bus
#
# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2015 Red Hat, Inc.
# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2016 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
......@@ -43,6 +43,8 @@ vapidir = $(datadir)/vala/vapi
vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
# for make distclean
CONFIG_CLEAN_FILES = $(VAPIGEN_VAPIS)
EXTRA_DIST = \
$(VAPIGEN_VAPIS) \
......
......@@ -18,8 +18,8 @@
#
# ibus - The Input Bus
#
# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2015 Red Hat, Inc.
# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2016 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
......@@ -123,7 +123,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -210,6 +209,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMOJI_JSON_FILE = @EMOJI_JSON_FILE@
ENV_IBUS_TEST = @ENV_IBUS_TEST@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
......@@ -289,6 +289,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
ISOCODES_LIBS = @ISOCODES_LIBS@
ISOCODES_PREFIX = @ISOCODES_PREFIX@
JSON_GLIB1_CFLAGS = @JSON_GLIB1_CFLAGS@
JSON_GLIB1_LIBS = @JSON_GLIB1_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
......@@ -300,6 +302,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
......@@ -356,6 +359,7 @@ WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
WAYLAND_LIBS = @WAYLAND_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
X11_PREFIX = @X11_PREFIX@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......@@ -436,6 +440,8 @@ ibus_1_0_vapi_FILES = \
vapidir = $(datadir)/vala/vapi
vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
# for make distclean
CONFIG_CLEAN_FILES = $(VAPIGEN_VAPIS)
EXTRA_DIST = \
$(VAPIGEN_VAPIS) \
IBus-1.0.metadata \
......
/* ibus-1.0.vapi generated by vapigen-0.28, do not modify. */
/* ibus-1.0.vapi generated by vapigen-0.32, do not modify. */
[CCode (cprefix = "IBus", gir_namespace = "IBus", gir_version = "1.0", lower_case_cprefix = "ibus_")]
namespace IBus {
......@@ -54,31 +54,31 @@ namespace IBus {
public string get_name_owner (string name);
public async void get_name_owner_async (string name, int timeout_msec, GLib.Cancellable? cancellable);
public string get_name_owner_async_finish (GLib.AsyncResult res) throws GLib.Error;
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public bool get_use_global_engine ();
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public async void get_use_global_engine_async (int timeout_msec, GLib.Cancellable? cancellable);
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public bool get_use_global_engine_async_finish (GLib.AsyncResult res) throws GLib.Error;
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public bool get_use_sys_layout ();
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public async void get_use_sys_layout_async (int timeout_msec, GLib.Cancellable? cancellable);
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public bool get_use_sys_layout_async_finish (GLib.AsyncResult res) throws GLib.Error;
public unowned string hello ();
public bool is_connected ();
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public bool is_global_engine_enabled ();
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public async void is_global_engine_enabled_async (int timeout_msec, GLib.Cancellable? cancellable);
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public bool is_global_engine_enabled_async_finish (GLib.AsyncResult res) throws GLib.Error;
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public GLib.List<weak IBus.EngineDesc> list_active_engines ();
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public async void list_active_engines_async (int timeout_msec, GLib.Cancellable? cancellable);
[Deprecated (since = "1.5.3")]
[Version (deprecated = true, deprecated_since = "1.5.3")]
public GLib.List<weak IBus.EngineDesc> list_active_engines_async_finish (GLib.AsyncResult res) throws GLib.Error;
public GLib.List<weak IBus.EngineDesc> list_engines ();
public async void list_engines_async (int timeout_msec, GLib.Cancellable? cancellable);
......@@ -334,6 +334,7 @@ namespace IBus {
public void set_capabilities (uint32 capabilities);
public void set_content_type (uint purpose, uint hints);
public void set_cursor_location (int32 x, int32 y, int32 w, int32 h);
public void set_cursor_location_relative (int32 x, int32 y, int32 w, int32 h);
public void set_engine (string name);
public void set_surrounding_text (IBus.Text text, uint32 cursor_pos, uint32 anchor_pos);
public signal void commit_text (IBus.Text text);
......@@ -363,7 +364,7 @@ namespace IBus {
public weak uint[] keymap;
public weak string name;
[CCode (has_construct_function = false)]
[Deprecated]
[Version (deprecated = true)]
public Keymap (string name);
public static IBus.Keymap @get (string name);
public uint lookup_keysym (uint16 keycode, uint32 state);
......@@ -451,6 +452,7 @@ namespace IBus {
public virtual signal void reset ();
public virtual signal void set_content_type (uint purpose, uint hints);
public virtual signal void set_cursor_location (int x, int y, int w, int h);
public virtual signal void set_cursor_location_relative (int x, int y, int w, int h);
public virtual signal void show_auxiliary_text ();
public virtual signal void show_language_bar ();
public virtual signal void show_lookup_table ();
......@@ -8965,12 +8967,18 @@ namespace IBus {
[CCode (cheader_filename = "ibus.h")]
public static unowned IBus.Attribute attr_foreground_new (uint color, uint start_index, uint end_index);
[CCode (cheader_filename = "ibus.h")]
[Deprecated]
public static unowned GLib.HashTable<string,void*> emoji_dict_load (string path);
[CCode (cheader_filename = "ibus.h")]
public static unowned GLib.SList<string> emoji_dict_lookup (GLib.HashTable<string,void*> dict, string annotation);
[CCode (cheader_filename = "ibus.h")]
public static void emoji_dict_save (string path, GLib.HashTable<string,void*> dict);
[CCode (cheader_filename = "ibus.h")]
[Version (deprecated = true)]
public static void free_strv (string strv);
[CCode (cheader_filename = "ibus.h")]
public static unowned string get_address ();
[CCode (cheader_filename = "ibus.h")]
[Deprecated]
[Version (deprecated = true)]
public static long get_daemon_uid ();
[CCode (cheader_filename = "ibus.h")]
public static unowned string get_language_name (string _locale);
......
......@@ -113,6 +113,14 @@ TESTS = \
$(NULL)
endif
TESTS_ENVIRONMENT = \
top_builddir=$(top_builddir) \
top_srcdir=$(top_srcdir) \
builddir=$(builddir) \
$(NULL)
LOG_COMPILER = $(top_srcdir)/src/tests/runtest
noinst_PROGRAMS = $(TESTS)
test_matchrule_DEPENDENCIES = \
......@@ -174,4 +182,15 @@ man_onedir = $(mandir)/man1
%.1.gz: %.1
$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
dbusservice_in_files = org.freedesktop.IBus.service.in
dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
dbusservicedir=${datadir}/dbus-1/services
org.freedesktop.IBus.service: org.freedesktop.IBus.service.in
$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@.tmp && mv $@.tmp $@
EXTRA_DIST += $(dbusservice_in_files)
CLEANFILES += $(dbusservice_DATA)
-include $(top_srcdir)/git.mk
......@@ -130,7 +130,8 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man_onedir)"
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbusservicedir)" \
"$(DESTDIR)$(man_onedir)"
am__EXEEXT_1 =
@ENABLE_TESTS_TRUE@am__EXEEXT_2 = test-matchrule$(EXEEXT) \
@ENABLE_TESTS_TRUE@ test-stress$(EXEEXT) $(am__EXEEXT_1)
......@@ -254,7 +255,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
DATA = $(man_one_DATA)
DATA = $(dbusservice_DATA) $(man_one_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
......@@ -488,6 +489,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMOJI_JSON_FILE = @EMOJI_JSON_FILE@
ENV_IBUS_TEST = @ENV_IBUS_TEST@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
......@@ -567,6 +569,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
ISOCODES_CFLAGS = @ISOCODES_CFLAGS@
ISOCODES_LIBS = @ISOCODES_LIBS@
ISOCODES_PREFIX = @ISOCODES_PREFIX@
JSON_GLIB1_CFLAGS = @JSON_GLIB1_CFLAGS@
JSON_GLIB1_LIBS = @JSON_GLIB1_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
......@@ -578,6 +582,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
......@@ -634,6 +639,7 @@ WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
WAYLAND_LIBS = @WAYLAND_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
X11_PREFIX = @X11_PREFIX@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......@@ -773,6 +779,13 @@ BUILT_SOURCES = \
marshalers.c \
$(NULL)
TESTS_ENVIRONMENT = \
top_builddir=$(top_builddir) \
top_srcdir=$(top_srcdir) \
builddir=$(builddir) \
$(NULL)
LOG_COMPILER = $(top_srcdir)/src/tests/runtest
test_matchrule_DEPENDENCIES = \
$(libibus) \
$(NULL)
......@@ -808,20 +821,17 @@ test_stress_LDADD = \
@X11_LIBS@ \
$(NULL)
EXTRA_DIST = \
$(man_one_in_files) \
marshalers.list \
$(NULL)
CLEANFILES = \
$(man_one_DATA) \
$(man_one_files) \
$(NULL)
EXTRA_DIST = $(man_one_in_files) marshalers.list $(NULL) \
$(dbusservice_in_files)
CLEANFILES = $(man_one_DATA) $(man_one_files) $(NULL) \
$(dbusservice_DATA)
man_one_in_files = ibus-daemon.1.in
man_one_files = $(man_one_in_files:.1.in=.1)
man_one_DATA = $(man_one_files:.1=.1.gz)
man_onedir = $(mandir)/man1
dbusservice_in_files = org.freedesktop.IBus.service.in
dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
dbusservicedir = ${datadir}/dbus-1/services
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
......@@ -1380,6 +1390,27 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
install-dbusserviceDATA: $(dbusservice_DATA)
@$(NORMAL_INSTALL)
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(dbusservicedir)'"; \
$(MKDIR_P) "$(DESTDIR)$(dbusservicedir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusservicedir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(dbusservicedir)" || exit $$?; \
done
uninstall-dbusserviceDATA:
@$(NORMAL_UNINSTALL)
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir)
install-man_oneDATA: $(man_one_DATA)
@$(NORMAL_INSTALL)
@list='$(man_one_DATA)'; test -n "$(man_onedir)" || list=; \
......@@ -1660,7 +1691,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man_onedir)"; do \
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(man_onedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
......@@ -1722,7 +1753,7 @@ info: info-am
info-am:
install-data-am: install-man_oneDATA
install-data-am: install-dbusserviceDATA install-man_oneDATA
install-dvi: install-dvi-am
......@@ -1768,7 +1799,8 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-man_oneDATA
uninstall-am: uninstall-binPROGRAMS uninstall-dbusserviceDATA \
uninstall-man_oneDATA
.MAKE: all check check-am install install-am install-strip
......@@ -1778,15 +1810,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-man_oneDATA
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-man_oneDATA install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man_oneDATA
install-data-am install-dbusserviceDATA install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-man_oneDATA install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-dbusserviceDATA uninstall-man_oneDATA
.PRECIOUS: Makefile
......@@ -1815,6 +1848,9 @@ test: ibus-daemon
%.1.gz: %.1
$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
org.freedesktop.IBus.service: org.freedesktop.IBus.service.in
$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@.tmp && mv $@.tmp $@
-include $(top_srcdir)/git.mk
# Tell versions [3.59,3.63) of GNU make to not export all variables.
......
......@@ -2,7 +2,8 @@
/* vim:set et sts=4: */
/* ibus - The Input Bus
* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
* Copyright (C) 2008-2013 Red Hat, Inc.
* Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
* Copyright (C) 2008-2016 Red Hat, Inc.