diff -Nru ibus-1.3.7/aclocal.m4 ibus-1.3.8/aclocal.m4 --- ibus-1.3.7/aclocal.m4 2010-08-03 09:00:30.000000000 +0000 +++ ibus-1.3.8/aclocal.m4 2010-10-22 06:16:22.000000000 +0000 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -558,7 +558,7 @@ dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. + dnl in configure.ac. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -687,7 +687,7 @@ dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_in,[],[ +ifdef(glib_configure_ac,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -804,8 +804,9 @@ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ]) -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -823,20 +824,21 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -864,7 +866,10 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -877,7 +882,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -886,34 +890,31 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -955,16 +956,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -972,25 +974,24 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .])dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES diff -Nru ibus-1.3.7/autogen.sh ibus-1.3.8/autogen.sh --- ibus-1.3.7/autogen.sh 2010-07-06 08:33:46.000000000 +0000 +++ ibus-1.3.8/autogen.sh 2010-10-22 05:44:59.000000000 +0000 @@ -22,4 +22,4 @@ touch $srcdir/ChangeLog } -ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.8 . gnome-autogen.sh +ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.8 CFLAGS="-Wall -Werror" . gnome-autogen.sh diff -Nru ibus-1.3.7/bindings/Makefile.in ibus-1.3.8/bindings/Makefile.in --- ibus-1.3.7/bindings/Makefile.in 2010-08-03 09:00:31.000000000 +0000 +++ ibus-1.3.8/bindings/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -192,6 +192,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -250,6 +251,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/bindings/vala/Makefile.in ibus-1.3.8/bindings/vala/Makefile.in --- ibus-1.3.7/bindings/vala/Makefile.in 2010-08-03 09:00:31.000000000 +0000 +++ ibus-1.3.8/bindings/vala/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -177,6 +177,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -235,6 +236,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/bus/connection.c ibus-1.3.8/bus/connection.c --- ibus-1.3.7/bus/connection.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/connection.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/connection.h ibus-1.3.8/bus/connection.h --- ibus-1.3.7/bus/connection.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/connection.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/dbusimpl.c ibus-1.3.8/bus/dbusimpl.c --- ibus-1.3.7/bus/dbusimpl.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/bus/dbusimpl.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/dbusimpl.h ibus-1.3.8/bus/dbusimpl.h --- ibus-1.3.7/bus/dbusimpl.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/dbusimpl.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -79,10 +80,10 @@ (BusDBusImpl *dbus, const gchar *name); void bus_dbus_impl_dispatch_message (BusDBusImpl *dbus, - DBusMessage *message); + IBusMessage *message); void bus_dbus_impl_dispatch_message_by_rule (BusDBusImpl *dbus, - DBusMessage *message, + IBusMessage *message, BusConnection *skip_connection); gboolean bus_dbus_impl_register_object (BusDBusImpl *dbus, IBusService *object); diff -Nru ibus-1.3.7/bus/engineproxy.c ibus-1.3.8/bus/engineproxy.c --- ibus-1.3.7/bus/engineproxy.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/bus/engineproxy.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -564,7 +565,9 @@ /* reply timeout */ IBusObject *connection; connection = (IBusObject *) ibus_proxy_get_connection ((IBusProxy *)call_data->engine); - ibus_object_destroy (connection); + if (connection) { + ibus_object_destroy (connection); + } } g_warning ("%s: %s", error->name, error->message); ibus_error_free (error); diff -Nru ibus-1.3.7/bus/engineproxy.h ibus-1.3.8/bus/engineproxy.h --- ibus-1.3.7/bus/engineproxy.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/engineproxy.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/factoryproxy.c ibus-1.3.8/bus/factoryproxy.c --- ibus-1.3.7/bus/factoryproxy.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/bus/factoryproxy.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/factoryproxy.h ibus-1.3.8/bus/factoryproxy.h --- ibus-1.3.7/bus/factoryproxy.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/factoryproxy.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/ibusimpl.c ibus-1.3.8/bus/ibusimpl.c --- ibus-1.3.7/bus/ibusimpl.c 2010-08-03 08:59:09.000000000 +0000 +++ ibus-1.3.8/bus/ibusimpl.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -610,6 +611,7 @@ #ifdef G_THREADS_ENABLED extern gint g_monitor_timeout; if (g_monitor_timeout != 0) { + /* Start the monitor of registry changes. */ bus_registry_start_monitor_changes (ibus->registry); } #endif @@ -810,13 +812,33 @@ return reply; } +static BusFactoryProxy * +_get_factory_proxy(IBusEngineDesc *engine_desc) +{ + BusFactoryProxy *factory; + GTimeVal t1, t2; + g_get_current_time (&t1); + while (1) { + if (g_main_context_pending (NULL)) { + g_main_context_iteration (NULL, FALSE); + factory = bus_factory_proxy_get_from_engine (engine_desc); + if (factory != NULL) { + return factory; + } + } + g_get_current_time (&t2); + if (t2.tv_sec - t1.tv_sec >= 5) + break; + } + return NULL; +} + static BusEngineProxy * bus_ibus_impl_create_engine (IBusEngineDesc *engine_desc) { IBusComponent *comp; BusFactoryProxy *factory; BusEngineProxy *engine; - GTimeVal t1, t2; factory = bus_factory_proxy_get_from_engine (engine_desc); @@ -827,23 +849,8 @@ if (!ibus_component_is_running (comp)) { ibus_component_start (comp, g_verbose); - g_get_current_time (&t1); - while (1) { - if (g_main_context_pending (NULL)) { - g_main_context_iteration (NULL, FALSE); - factory = bus_factory_proxy_get_from_engine (engine_desc); - if (factory != NULL) { - break; - } - } - g_get_current_time (&t2); - if (t2.tv_sec - t1.tv_sec >= 5) - break; - } - } - else { - factory = bus_factory_proxy_get_from_engine (engine_desc); } + factory = _get_factory_proxy (engine_desc); } if (factory == NULL) { @@ -887,7 +894,6 @@ BusIBusImpl *ibus) { IBusEngineDesc *engine_desc = NULL; - BusEngineProxy *engine; /* context should has focus before request an engine */ g_return_if_fail (bus_input_context_has_focus (context)); @@ -1921,8 +1927,9 @@ if (current_engine_desc != new_engine_desc) { bus_ibus_impl_set_context_engine_from_desc (ibus, context, new_engine_desc); - return TRUE; } + + return TRUE; } return FALSE; @@ -1934,7 +1941,8 @@ GValue value = { 0 }; gchar *global_engine_name = NULL; - g_assert (IBUS_IS_CONFIG (ibus->config)); + g_assert (BUS_IS_IBUS_IMPL (ibus)); + g_return_val_if_fail (IBUS_IS_CONFIG (ibus->config), NULL); if (ibus_config_get_value (ibus->config, "general", "global_engine", &value) && G_VALUE_TYPE (&value) == G_TYPE_STRING) { @@ -1948,7 +1956,8 @@ static void bus_ibus_impl_save_global_engine_name_to_config (BusIBusImpl *ibus) { - g_assert (IBUS_IS_CONFIG (ibus->config)); + g_assert (BUS_IS_IBUS_IMPL (ibus)); + g_return_if_fail (IBUS_IS_CONFIG (ibus->config)); if (ibus->use_global_engine && ibus->global_engine) { GValue value = { 0 }; @@ -1966,7 +1975,8 @@ GValue value = { 0 }; gchar *global_previous_engine_name = NULL; - g_assert (IBUS_IS_CONFIG (ibus->config)); + g_assert (BUS_IS_IBUS_IMPL (ibus)); + g_return_val_if_fail (IBUS_IS_CONFIG (ibus->config), NULL); if (ibus_config_get_value (ibus->config, "general", "global_previous_engine", &value) && G_VALUE_TYPE (&value) == G_TYPE_STRING) { @@ -1980,7 +1990,8 @@ static void bus_ibus_impl_save_global_previous_engine_name_to_config (BusIBusImpl *ibus) { - g_assert (IBUS_IS_CONFIG (ibus->config)); + g_assert (BUS_IS_IBUS_IMPL (ibus)); + g_return_if_fail (IBUS_IS_CONFIG (ibus->config)); if (ibus->use_global_engine && ibus->global_previous_engine_name) { GValue value = { 0 }; diff -Nru ibus-1.3.7/bus/ibusimpl.h ibus-1.3.8/bus/ibusimpl.h --- ibus-1.3.7/bus/ibusimpl.h 2010-08-03 02:03:05.000000000 +0000 +++ ibus-1.3.8/bus/ibusimpl.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/inputcontext.c ibus-1.3.8/bus/inputcontext.c --- ibus-1.3.7/bus/inputcontext.c 2010-08-03 02:03:05.000000000 +0000 +++ ibus-1.3.8/bus/inputcontext.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -935,6 +936,18 @@ if (context->enabled && context->engine) { bus_engine_proxy_property_activate (context->engine, prop_name, prop_state); } +#ifdef OS_CHROMEOS + /* Global engine is always enabled in chromeos, + * so pass PropertyActivate signal to the focused context. + */ + else { + if (context->fake && + BUS_DEFAULT_IBUS->focused_context && + BUS_DEFAULT_IBUS->focused_context->engine) { + bus_engine_proxy_property_activate (BUS_DEFAULT_IBUS->focused_context->engine, prop_name, prop_state); + } + } +#endif reply = ibus_message_new_method_return (message); return reply; diff -Nru ibus-1.3.7/bus/inputcontext.h ibus-1.3.8/bus/inputcontext.h --- ibus-1.3.7/bus/inputcontext.h 2010-07-30 09:57:56.000000000 +0000 +++ ibus-1.3.8/bus/inputcontext.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/main.c ibus-1.3.8/bus/main.c --- ibus-1.3.7/bus/main.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/bus/main.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -19,6 +20,7 @@ * Boston, MA 02111-1307, USA. */ #include +#include #include #include #include @@ -155,17 +157,6 @@ #endif static void -_my_log_handler (const gchar *log_domain, - GLogLevelFlags log_level, - const gchar *message, - gpointer user_data) -{ - if (g_verbose) { - g_log_default_handler (log_domain, log_level, message, user_data); - } -} - -static void _sig_usr2_handler (int sig) { g_mem_profile (); @@ -225,10 +216,7 @@ #ifdef G_THREADS_ENABLED g_thread_init (NULL); #endif - g_log_set_handler (G_LOG_DOMAIN, - G_LOG_LEVEL_WARNING | G_LOG_LEVEL_DEBUG | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, - _my_log_handler, - NULL); + ibus_set_log_handler(g_verbose); /* check if ibus-daemon is running in this session */ if (ibus_get_address () != NULL) { diff -Nru ibus-1.3.7/bus/Makefile.am ibus-1.3.8/bus/Makefile.am --- ibus-1.3.7/bus/Makefile.am 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/Makefile.am 2010-10-22 05:56:12.000000000 +0000 @@ -47,6 +47,7 @@ TESTS = \ test-matchrule \ + test-stress \ $(NULL) xdgautostart_DATA = \ ibus.desktop \ @@ -114,6 +115,22 @@ $(AM_LDADD) \ $(NULL) +test_stress_SOURCES = \ + test-client.c \ + test-client.h \ + test-stress.c \ + $(NULL) +test_stress_CFLAGS = \ + $(AM_CFLAGS) \ + @GTK2_CFLAGS@ \ + @X11_CFLAGS@ \ + $(NULL) +test_stress_LDADD = \ + $(AM_LDADD) \ + @GTK2_LIBS@ \ + @X11_LIBS@ \ + $(NULL) + EXTRA_DIST = \ $(desktop_in_files) \ $(NULL) diff -Nru ibus-1.3.7/bus/Makefile.in ibus-1.3.8/bus/Makefile.in --- ibus-1.3.7/bus/Makefile.in 2010-08-03 09:00:31.000000000 +0000 +++ ibus-1.3.8/bus/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -57,7 +57,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -TESTS = test-matchrule$(EXEEXT) +TESTS = test-matchrule$(EXEEXT) test-stress$(EXEEXT) noinst_PROGRAMS = $(am__EXEEXT_1) bin_PROGRAMS = ibus-daemon$(EXEEXT) subdir = bus @@ -76,7 +76,7 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ "$(DESTDIR)$(xdgautostartdir)" -am__EXEEXT_1 = test-matchrule$(EXEEXT) +am__EXEEXT_1 = test-matchrule$(EXEEXT) test-stress$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_ibus_daemon_OBJECTS = ibus_daemon-main.$(OBJEXT) \ ibus_daemon-dbusimpl.$(OBJEXT) ibus_daemon-ibusimpl.$(OBJEXT) \ @@ -103,6 +103,13 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_matchrule_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \ $@ +am_test_stress_OBJECTS = test_stress-test-client.$(OBJEXT) \ + test_stress-test-stress.$(OBJEXT) +test_stress_OBJECTS = $(am_test_stress_OBJECTS) +test_stress_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_stress_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_stress_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -129,8 +136,10 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(ibus_daemon_SOURCES) $(test_matchrule_SOURCES) -DIST_SOURCES = $(ibus_daemon_SOURCES) $(test_matchrule_SOURCES) +SOURCES = $(ibus_daemon_SOURCES) $(test_matchrule_SOURCES) \ + $(test_stress_SOURCES) +DIST_SOURCES = $(ibus_daemon_SOURCES) $(test_matchrule_SOURCES) \ + $(test_stress_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -232,6 +241,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -290,6 +300,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -462,6 +474,24 @@ $(AM_LDADD) \ $(NULL) +test_stress_SOURCES = \ + test-client.c \ + test-client.h \ + test-stress.c \ + $(NULL) + +test_stress_CFLAGS = \ + $(AM_CFLAGS) \ + @GTK2_CFLAGS@ \ + @X11_CFLAGS@ \ + $(NULL) + +test_stress_LDADD = \ + $(AM_LDADD) \ + @GTK2_LIBS@ \ + @X11_LIBS@ \ + $(NULL) + EXTRA_DIST = \ $(desktop_in_files) \ $(NULL) @@ -562,6 +592,9 @@ test-matchrule$(EXEEXT): $(test_matchrule_OBJECTS) $(test_matchrule_DEPENDENCIES) @rm -f test-matchrule$(EXEEXT) $(AM_V_CCLD)$(test_matchrule_LINK) $(test_matchrule_OBJECTS) $(test_matchrule_LDADD) $(LIBS) +test-stress$(EXEEXT): $(test_stress_OBJECTS) $(test_stress_DEPENDENCIES) + @rm -f test-stress$(EXEEXT) + $(AM_V_CCLD)$(test_stress_LINK) $(test_stress_OBJECTS) $(test_stress_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -583,6 +616,8 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_matchrule-connection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_matchrule-matchrule.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_matchrule-test-matchrule.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_stress-test-client.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_stress-test-stress.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -832,6 +867,38 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_matchrule_CFLAGS) $(CFLAGS) -c -o test_matchrule-test-matchrule.obj `if test -f 'test-matchrule.c'; then $(CYGPATH_W) 'test-matchrule.c'; else $(CYGPATH_W) '$(srcdir)/test-matchrule.c'; fi` +test_stress-test-client.o: test-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_stress_CFLAGS) $(CFLAGS) -MT test_stress-test-client.o -MD -MP -MF $(DEPDIR)/test_stress-test-client.Tpo -c -o test_stress-test-client.o `test -f 'test-client.c' || echo '$(srcdir)/'`test-client.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_stress-test-client.Tpo $(DEPDIR)/test_stress-test-client.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-client.c' object='test_stress-test-client.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_stress_CFLAGS) $(CFLAGS) -c -o test_stress-test-client.o `test -f 'test-client.c' || echo '$(srcdir)/'`test-client.c + +test_stress-test-client.obj: test-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_stress_CFLAGS) $(CFLAGS) -MT test_stress-test-client.obj -MD -MP -MF $(DEPDIR)/test_stress-test-client.Tpo -c -o test_stress-test-client.obj `if test -f 'test-client.c'; then $(CYGPATH_W) 'test-client.c'; else $(CYGPATH_W) '$(srcdir)/test-client.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_stress-test-client.Tpo $(DEPDIR)/test_stress-test-client.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-client.c' object='test_stress-test-client.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_stress_CFLAGS) $(CFLAGS) -c -o test_stress-test-client.obj `if test -f 'test-client.c'; then $(CYGPATH_W) 'test-client.c'; else $(CYGPATH_W) '$(srcdir)/test-client.c'; fi` + +test_stress-test-stress.o: test-stress.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_stress_CFLAGS) $(CFLAGS) -MT test_stress-test-stress.o -MD -MP -MF $(DEPDIR)/test_stress-test-stress.Tpo -c -o test_stress-test-stress.o `test -f 'test-stress.c' || echo '$(srcdir)/'`test-stress.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_stress-test-stress.Tpo $(DEPDIR)/test_stress-test-stress.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-stress.c' object='test_stress-test-stress.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_stress_CFLAGS) $(CFLAGS) -c -o test_stress-test-stress.o `test -f 'test-stress.c' || echo '$(srcdir)/'`test-stress.c + +test_stress-test-stress.obj: test-stress.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_stress_CFLAGS) $(CFLAGS) -MT test_stress-test-stress.obj -MD -MP -MF $(DEPDIR)/test_stress-test-stress.Tpo -c -o test_stress-test-stress.obj `if test -f 'test-stress.c'; then $(CYGPATH_W) 'test-stress.c'; else $(CYGPATH_W) '$(srcdir)/test-stress.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_stress-test-stress.Tpo $(DEPDIR)/test_stress-test-stress.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-stress.c' object='test_stress-test-stress.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_stress_CFLAGS) $(CFLAGS) -c -o test_stress-test-stress.obj `if test -f 'test-stress.c'; then $(CYGPATH_W) 'test-stress.c'; else $(CYGPATH_W) '$(srcdir)/test-stress.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff -Nru ibus-1.3.7/bus/matchrule.c ibus-1.3.8/bus/matchrule.c --- ibus-1.3.7/bus/matchrule.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/bus/matchrule.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -413,7 +414,7 @@ gboolean bus_match_rule_match (BusMatchRule *rule, - DBusMessage *message) + IBusMessage *message) { g_assert (rule != NULL); g_assert (message != NULL); @@ -450,7 +451,7 @@ if (rule->flags & MATCH_ARGS) { guint i; - DBusMessageIter iter; + IBusMessageIter iter; ibus_message_iter_init (message, &iter); @@ -625,7 +626,7 @@ GList * bus_match_rule_get_recipients (BusMatchRule *rule, - DBusMessage *message) + IBusMessage *message) { g_assert (BUS_IS_MATCH_RULE (rule)); g_assert (message != NULL); diff -Nru ibus-1.3.7/bus/matchrule.h ibus-1.3.8/bus/matchrule.h --- ibus-1.3.7/bus/matchrule.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/matchrule.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -106,7 +107,7 @@ guint arg_i, const gchar *arg); gboolean bus_match_rule_match (BusMatchRule *rule, - DBusMessage *message); + IBusMessage *message); gboolean bus_match_rule_is_equal (BusMatchRule *a, BusMatchRule *b); void bus_match_rule_add_recipient @@ -117,7 +118,7 @@ BusConnection *connection); GList *bus_match_rule_get_recipients (BusMatchRule *rule, - DBusMessage *message); + IBusMessage *message); G_END_DECLS #endif diff -Nru ibus-1.3.7/bus/option.h ibus-1.3.8/bus/option.h --- ibus-1.3.7/bus/option.h 2010-07-22 08:53:36.000000000 +0000 +++ ibus-1.3.8/bus/option.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/panelproxy.c ibus-1.3.8/bus/panelproxy.c --- ibus-1.3.7/bus/panelproxy.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/bus/panelproxy.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/panelproxy.h ibus-1.3.8/bus/panelproxy.h --- ibus-1.3.7/bus/panelproxy.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/panelproxy.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/registry.c ibus-1.3.8/bus/registry.c --- ibus-1.3.7/bus/registry.c 2010-07-22 08:53:36.000000000 +0000 +++ ibus-1.3.8/bus/registry.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -73,6 +74,14 @@ registry->engine_table = g_hash_table_new (g_str_hash, g_str_equal); #ifdef G_THREADS_ENABLED + /* If glib supports thread, we'll create a thread to monitor changes in IME + * XML files and related files, so users can use newly installed IMEs + * immediatlly. + * Note that we don't use GFileMonitor for watching as we need to monitor + * not only XML files but also other related files that can be scattered in + * many places. Monitoring these files with GFileMonitor would be make it + * complicated. hence we use a thread to poll the changes. + */ registry->thread = NULL; registry->thread_running = TRUE; registry->mutex = g_mutex_new (); @@ -81,17 +90,18 @@ #endif if (g_strcmp0 (g_cache, "none") == 0) { - /* only load registry, but not read and write cache */ + /* Only load registry, but not read and write cache. */ bus_registry_load (registry); } else if (g_strcmp0 (g_cache, "refresh") == 0) { - /* load registry and overwrite the cache */ + /* Load registry and overwrite the cache. */ bus_registry_load (registry); bus_registry_save_cache (registry); } else { - /* load registry from cache. - * If the cache does not exist or it is outdated, then rebuild it */ + /* Load registry from cache. If the cache does not exist or + * it is outdated, then generate it. + */ if (bus_registry_load_cache (registry) == FALSE || bus_registry_check_modification (registry)) { bus_registry_remove_all (registry); @@ -134,8 +144,14 @@ g_mutex_lock (registry->mutex); registry->thread_running = FALSE; g_mutex_unlock (registry->mutex); + + /* Raise a signal to cause the loop in _checks_changes() exits + * immediately, and then wait until the thread finishes, and release all + * resources of the thread. + * */ g_cond_signal (registry->cond); g_thread_join (registry->thread); + registry->thread = NULL; } #endif @@ -492,10 +508,25 @@ GTimeVal tv; g_get_current_time (&tv); g_time_val_add (&tv, g_monitor_timeout * G_USEC_PER_SEC); - + /* Wait for the condition change or timeout. It will also unlock + * the mutex, so that other thread could obay the lock and modify + * the condition value. + * Note that we use g_cond_timed_wait() here rather than sleep() so + * that the loop can terminate immediately when the registry object + * is destroyed. See also comments in bus_registry_destroy(). + */ if (g_cond_timed_wait (registry->cond, registry->mutex, &tv) == FALSE) { - /* timeout */ + /* Timeout happens. We check the modification of all IMEs' xml files + * and related files specified in in xml files. + * If any file is changed, the changed signal will be emitted in + * main thread. It is for finding install/uninstall/upgrade of IMEs. + * On Linux desktop, ibus will popup UI to notificate users that + * some IMEs are changed and ibus need a restart. + */ if (bus_registry_check_modification (registry)) { + /* Emit the changed signal in main thread, and terminate + * this thread. + */ registry->changed = TRUE; g_idle_add ((GSourceFunc) _emit_changed_signal_cb, registry); break; diff -Nru ibus-1.3.7/bus/registry.h ibus-1.3.8/bus/registry.h --- ibus-1.3.7/bus/registry.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/registry.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/server.c ibus-1.3.8/bus/server.c --- ibus-1.3.7/bus/server.c 2010-07-01 04:58:57.000000000 +0000 +++ ibus-1.3.8/bus/server.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -18,6 +19,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ +#include #include #include #include diff -Nru ibus-1.3.7/bus/server.h ibus-1.3.8/bus/server.h --- ibus-1.3.7/bus/server.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/bus/server.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/bus/test-client.c ibus-1.3.8/bus/test-client.c --- ibus-1.3.7/bus/test-client.c 1970-01-01 00:00:00.000000000 +0000 +++ ibus-1.3.8/bus/test-client.c 2010-10-21 10:58:33.000000000 +0000 @@ -0,0 +1,399 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +/* vim:set et sts=4: */ +/* bus - The Input Bus + * Copyright (C) 2010 Google Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include +#include +#include + +#include "test-client.h" + +#ifdef DEBUG +# define IDEBUG g_debug +#else +# define IDEBUG(a...) +#endif +/* functions prototype */ +static void bus_test_client_class_init (BusTestClientClass *klass); +static void bus_test_client_destroy (IBusObject *object); + +/* static methods*/ +static gchar* _get_active_engine_name (void); +static void _store_modifier_state (BusTestClient *client, + guint modifier); +static gboolean _is_shift_set (BusTestClient *client); +static gboolean _is_modifier_set (BusTestClient *client, + guint modifier); +static gboolean _is_modifier_key (guint modifier); +static guint _get_modifiers_to_mask (BusTestClient *client); +static gint16 _get_keysym_to_keycode (guint keysym); + +static void _bus_disconnected_cb (IBusBus *ibusbus, + BusTestClient *client); +static void _bus_disabled_cb (IBusInputContext *ibuscontext, + BusTestClient *client); + +static IBusBus *_bus = NULL; +static Display *_xdisplay = NULL; + + +G_DEFINE_TYPE (BusTestClient, bus_test_client, IBUS_TYPE_OBJECT) + +static void +bus_test_client_class_init (BusTestClientClass *klass) +{ + IDEBUG ("%s", __FUNCTION__); + + IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (klass); + + ibus_object_class->destroy = bus_test_client_destroy; + + /* init display object */ + if (_xdisplay == NULL) { + _xdisplay = XOpenDisplay (gdk_display_get_name (gdk_display_get_default ())); + } + + /* init bus object */ + if (_bus == NULL) { + ibus_set_display (XDisplayString (_xdisplay)); + _bus = ibus_bus_new(); + } + + g_signal_connect (_bus, "disconnected", G_CALLBACK (_bus_disconnected_cb), NULL); +} + +static void +bus_test_client_init (BusTestClient *client) +{ + IDEBUG ("%s", __FUNCTION__); + gchar *active_engine_name; + client->connected = FALSE; + client->enabled = FALSE; + + g_return_if_fail (ibus_bus_is_connected (_bus)); + client->connected = TRUE; + + client->ibuscontext = ibus_bus_create_input_context (_bus, "test-client"); + + g_return_if_fail (client->ibuscontext != NULL); + g_object_ref_sink (client->ibuscontext); + + g_signal_connect (client->ibuscontext, + "disabled", + G_CALLBACK (_bus_disabled_cb), + client); + + bus_test_client_clear_modifier (client); + + client->caps = IBUS_CAP_FOCUS; + ibus_input_context_set_capabilities (client->ibuscontext, client->caps); + + active_engine_name = _get_active_engine_name (); + + g_return_if_fail (active_engine_name != NULL); + IDEBUG ("engine:%s", active_engine_name); + ibus_input_context_focus_in (client->ibuscontext); + ibus_input_context_set_engine (client->ibuscontext, active_engine_name); + g_free (active_engine_name); + + ibus_input_context_enable (client->ibuscontext); + client->enabled = TRUE; +} + +static void +bus_test_client_destroy (IBusObject *object) +{ + IDEBUG ("%s", __FUNCTION__); + BusTestClient *client = BUS_TEST_CLIENT (object); + + g_object_unref (client->ibuscontext); +} + +BusTestClient * +bus_test_client_new (void) +{ + IDEBUG ("%s", __FUNCTION__); + BusTestClient *client = BUS_TEST_CLIENT (g_object_new (BUS_TYPE_TEST_CLIENT, NULL)); + + if (client->connected && client->enabled) { + return client; + } else { + return NULL; + } +} + +gboolean +bus_test_client_is_enabled (BusTestClient *client) +{ + IDEBUG ("%s", __FUNCTION__); + return client->enabled; +} + +gboolean +bus_test_client_is_connected (BusTestClient *client) +{ + IDEBUG ("%s", __FUNCTION__); + return client->connected; +} + +gboolean +bus_test_client_send_key (BusTestClient *client, + guint keysym) +{ + gboolean is_modifier = _is_modifier_key (keysym); + gint16 keycode; + guint state; + + if (is_modifier) { + IDEBUG ("key: %d is modifier.", keysym); + gboolean is_modifier_set = _is_modifier_set (client, keysym); + keycode = _get_keysym_to_keycode (keysym); + state = _get_modifiers_to_mask (client); + + if (is_modifier_set) { + state |= IBUS_RELEASE_MASK; + } + ibus_input_context_process_key_event (client->ibuscontext, + keysym, + keycode, + state); + _store_modifier_state (client, keysym); + } else { + IDEBUG ("key: %d is not modifier.", keysym); + gboolean is_upper = !gdk_keyval_is_lower (keysym); + gboolean is_shift_set = _is_shift_set (client); + + if (is_upper && !is_shift_set) { + _store_modifier_state (client, IBUS_Shift_L); + } + keycode = _get_keysym_to_keycode (keysym); + state = _get_modifiers_to_mask (client); + ibus_input_context_process_key_event (client->ibuscontext, + keysym, + keycode, + state); + state |= IBUS_RELEASE_MASK; + ibus_input_context_process_key_event (client->ibuscontext, + keysym, + keycode, + state); + if (is_upper && !is_shift_set) { + _store_modifier_state (client, IBUS_Shift_L); + } + } + return TRUE; +} + +void bus_test_client_clear_modifier (BusTestClient *client) +{ + int i; + for (i = 0; i < MODIFIER_KEY_NUM; i++) { + (client->modifier)[i] = FALSE; + } +} + +static gchar * +_get_active_engine_name (void) +{ + GList *engines; + gchar *result; + + engines = ibus_bus_list_active_engines (_bus); + if (engines == NULL) { + return NULL; + } + + IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (engines->data); + if (engine_desc != NULL) { + result = g_strdup (engine_desc->name); + } else { + result = NULL; + } + + for (; engines != NULL; engines = g_list_next (engines)) { + g_object_unref (IBUS_ENGINE_DESC (engines->data)); + } + g_list_free (engines); + + return result; +} + +static void +_store_modifier_state (BusTestClient *client, + guint modifier) +{ + switch(modifier) { + case IBUS_Shift_L: + case IBUS_Shift_R: + /* ShiftMask */ + client->modifier[0] = !client->modifier[0]; + break; + case IBUS_Shift_Lock: + case IBUS_Caps_Lock: + /* LockMask */ + client->modifier[1] = !client->modifier[1]; + break; + case IBUS_Control_L: + case IBUS_Control_R: + /* ControlMask */ + client->modifier[2] = !client->modifier[2]; + break; + case IBUS_Alt_L: + case IBUS_Alt_R: + case IBUS_Meta_L: + /* Mod1Mask */ + client->modifier[3] = !client->modifier[3]; + break; + case IBUS_Num_Lock: + /* Mod2Mask */ + client->modifier[4] = !client->modifier[4]; + break; + case IBUS_Super_L: + case IBUS_Hyper_L: + /* Mod4Mask */ + client->modifier[5] = !client->modifier[5]; + break; + case IBUS_ISO_Level3_Shift: + case IBUS_Mode_switch: + /* Mod5Mask */ + client->modifier[6] = !client->modifier[6]; + break; + default: + break; + } +} + +static gint16 +_get_keysym_to_keycode (guint keysym) +{ + return XKeysymToKeycode (_xdisplay, keysym); +} + +static gboolean +_is_shift_set (BusTestClient *client) +{ + return client->modifier[0]; +} + +static gboolean +_is_modifier_set (BusTestClient *client, + guint modifier) +{ + switch(modifier) { + case IBUS_Shift_L: + case IBUS_Shift_R: + /* ShiftMask */ + return client->modifier[0]; + case IBUS_Shift_Lock: + case IBUS_Caps_Lock: + /* LockMask */ + return client->modifier[1]; + case IBUS_Control_L: + case IBUS_Control_R: + /* ControlMask */ + return client->modifier[2]; + case IBUS_Alt_L: + case IBUS_Alt_R: + case IBUS_Meta_L: + /* Mod1Mask */ + return client->modifier[3]; + case IBUS_Num_Lock: + /* Mod2Mask */ + return client->modifier[4]; + case IBUS_Super_L: + case IBUS_Hyper_L: + /* Mod4Mask */ + return client->modifier[5]; + case IBUS_ISO_Level3_Shift: + case IBUS_Mode_switch: + /* Mod5Mask */ + return client->modifier[6]; + default: + return FALSE; + } +} + +static gboolean +_is_modifier_key (guint modifier) +{ + switch(modifier) { + case IBUS_Shift_L: + case IBUS_Shift_R: + case IBUS_Shift_Lock: + case IBUS_Caps_Lock: + case IBUS_Control_L: + case IBUS_Control_R: + case IBUS_Alt_L: + case IBUS_Alt_R: + case IBUS_Meta_L: + case IBUS_Num_Lock: + case IBUS_Super_L: + case IBUS_Hyper_L: + case IBUS_ISO_Level3_Shift: + case IBUS_Mode_switch: + return TRUE; + default: + return FALSE; + } +} + +static guint +_get_modifiers_to_mask (BusTestClient *client) +{ + guint retval = 0; + if(client->modifier[0]) + retval |= IBUS_SHIFT_MASK; + if(client->modifier[1]) + retval |= IBUS_LOCK_MASK; + if(client->modifier[2]) + retval |= IBUS_CONTROL_MASK; + if(client->modifier[3]) + retval |= IBUS_MOD1_MASK; + if(client->modifier[4]) + retval |= IBUS_MOD2_MASK; + if(client->modifier[5]) + retval |= IBUS_MOD4_MASK; + if(client->modifier[6]) + retval |= IBUS_MOD5_MASK; + return retval; +} + +static void +_bus_disconnected_cb (IBusBus *ibusbus, + BusTestClient *client) +{ + g_assert (IBUS_IS_BUS (ibusbus)); + g_assert (BUS_IS_TEST_CLIENT (client)); + IDEBUG ("%s", __FUNCTION__); + client->connected = FALSE; + IDEBUG ("Disconnected ibus daemon"); +} + +static void +_bus_disabled_cb (IBusInputContext *ibuscontext, + BusTestClient *client) +{ + g_assert (IBUS_IS_INPUT_CONTEXT (ibuscontext)); + g_assert (BUS_IS_TEST_CLIENT (client)); + IDEBUG ("%s", __FUNCTION__); + client->enabled = FALSE; + IDEBUG ("Disabled ibus engine"); +} + diff -Nru ibus-1.3.7/bus/test-client.h ibus-1.3.8/bus/test-client.h --- ibus-1.3.7/bus/test-client.h 1970-01-01 00:00:00.000000000 +0000 +++ ibus-1.3.8/bus/test-client.h 2010-10-21 10:58:33.000000000 +0000 @@ -0,0 +1,81 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +/* vim:set et sts=4: */ +/* bus - The Input Bus + * Copyright (C) 2010 Google Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __BUS_TEST_CLIENT_H_ +#define __BUS_TEST_CLIENT_H_ + +#include + +/* + * Type macros. + */ + +/* define GOBJECT macros */ +#define BUS_TYPE_TEST_CLIENT \ + (bus_test_client_get_type ()) +#define BUS_TEST_CLIENT(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), BUS_TYPE_TEST_CLIENT, BusTestClient)) +#define BUS_TEST_CLIENT_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), BUS_TYPE_TEST_CLIENT, BusTestClientClass)) +#define BUS_IS_TEST_CLIENT(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BUS_TYPE_TEST_CLIENT)) +#define BUS_IS_TEST_CLIENT_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), BUS_TYPE_TEST_CLIENT)) +#define BUS_TEST_CLIENT_GET_CLASS(obj) \ + (G_TYPE_CHECK_GET_CLASS ((obj), BUS_TYPE_TEST_CLIENT, BusTestClientClass)) + +#define MODIFIER_KEY_NUM 7 + +G_BEGIN_DECLS +typedef struct _BusTestClient BusTestClient; +typedef struct _BusTestClientClass BusTestClientClass; + +struct _BusTestClient { + IBusObject parent; + /* instance members */ + IBusInputContext *ibuscontext; + /* modifier key state */ + gboolean modifier[MODIFIER_KEY_NUM]; + + gint caps; + /* engine is enabled */ + gboolean enabled; + /* ibus-daemon is enabled */ + gboolean connected; + /* private member */ +}; + +struct _BusTestClientClass { + IBusObjectClass parent; + /* class members */ +}; + +GType bus_test_client_get_type (void); +BusTestClient *bus_test_client_new (void); +gboolean bus_test_client_is_enabled (BusTestClient *client); +gboolean bus_test_client_is_connected (BusTestClient *client); +gboolean bus_test_client_send_key (BusTestClient *client, + guint keysym); +void bus_test_client_clear_modifier (BusTestClient *client); + +G_END_DECLS +#endif + diff -Nru ibus-1.3.7/bus/test-matchrule.c ibus-1.3.8/bus/test-matchrule.c --- ibus-1.3.7/bus/test-matchrule.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/bus/test-matchrule.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #include #include "matchrule.h" diff -Nru ibus-1.3.7/bus/test-stress.c ibus-1.3.8/bus/test-stress.c --- ibus-1.3.7/bus/test-stress.c 1970-01-01 00:00:00.000000000 +0000 +++ ibus-1.3.8/bus/test-stress.c 2010-10-22 05:56:12.000000000 +0000 @@ -0,0 +1,117 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +/* vim:set et sts=4: */ +/* bus - The Input Bus + * Copyright (C) 2010 Google Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +#include +#include + +#include +#include +#include +#include +#include "test-client.h" + +#define MAX_SEND_KEY_NUM 100 +#define MAX_RANDOM_SPACE 5 + +static gboolean +_sleep_cb (gpointer user_data) +{ + gtk_main_quit (); + return FALSE; +} + +static void +_sleep (guint millisecond) +{ + g_timeout_add (millisecond, (GSourceFunc) _sleep_cb, NULL); + gtk_main (); +} + +/* ibus stress test + Send random key press and release event message to ibus-daemon. + Key kind are a-z and space. + Check ibus-daemon and ibus engine crash. +*/ +gint +main (gint argc, gchar **argv) +{ + GTimer *timer; + GRand *rnd; + BusTestClient *client; + /* num of send space key */ + guint32 seed = (guint32) time (NULL); + int count = 0; + int send_key_num = 0; + + setlocale (LC_ALL, ""); + gtk_set_locale (); + gtk_init (&argc, &argv); + + /* need to set active engine */ + client = bus_test_client_new (); + if (client == NULL) { + g_printerr ("don't create test-client instance."); + exit(1); + } + + timer = g_timer_new (); + rnd = g_rand_new (); + g_rand_set_seed (rnd, seed); + g_print("random seed:%u\n",seed); + g_timer_start (timer); + + while (1) { + guint keysym; + if (send_key_num > MAX_SEND_KEY_NUM) { + break; + } + if (!bus_test_client_is_connected (client)) { + g_printerr ("ibus-daemon is disconnected\n"); + break; + } + if (!bus_test_client_is_enabled (client)) { + g_printerr ("ibus engine is enabled\n"); + break; + } + + if(count>0 || g_rand_int_range (rnd, 0, 5) == 0) { + /* send space key 20% */ + if (count == 0) { + count = g_rand_int_range (rnd, 0, MAX_RANDOM_SPACE) + 1; + } + if (count-- == 1) { + keysym = IBUS_Return; + } else { + keysym = IBUS_space; + } + } else { + /* send random a-z key */ + keysym = g_rand_int_range (rnd, 0, 'z'-'a'+1) + 'a'; + } + bus_test_client_send_key (client, keysym); + send_key_num += 1; + /* limit the typing rate to 800 hits/minutes */ + _sleep (1000 * 60 / 800); + } + + g_print ("%f sec\n", g_timer_elapsed (timer, NULL)); + + return 0; +} diff -Nru ibus-1.3.7/ChangeLog ibus-1.3.8/ChangeLog --- ibus-1.3.7/ChangeLog 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/ChangeLog 2010-10-22 06:16:36.000000000 +0000 @@ -1,3 +1,533 @@ +commit 011f5d0dfdee6432a1d1a151a18be8520c4afcba +Author: Peng Huang +Date: 2010-10-22 15:15:39 +0900 + + Bump the version to 1.3.8 + +M configure.ac + +commit 39c27754649024ce563744ed074c7b30c89a0cd7 +Author: Peng Huang +Date: 2010-10-22 15:07:27 +0900 + + Comment out test-keymap test case. + + Comment out test-keymap test case, because it is not automatic test + case. it will cause make distcheck failed. + +M src/test-keymap.c + +commit 2b1fa3dc2a2cb57484de5506f4081f933ba1c0a4 +Author: Peng Huang +Date: 2010-10-22 14:56:12 +0900 + + Limit typing rate to 800 hits/minutes, and fix make distcheck error. + + The old version test-stress will send key events to ibus-daemon as fast as possible. It will take all CPU resources, and the daemon, UI and input methods will not get enouch CPU resources to process those events. So all key events will be putted in the buffer. It will causes out of system memory. So I add a limitation of typing rate as 800 hits/minute. + + BUG=none + TEST=manual + + Review URL: http://codereview.appspot.com/2662042 + +M bus/Makefile.am +M bus/test-stress.c + +commit 74cf9101c7d1700d6add470df9db59fe3593f3a1 +Author: Peng Huang +Date: 2010-10-22 12:27:37 +0900 + + Catch exceptions from os.kill. + + BUG=none + TEST=manual + + Review URL: http://codereview.appspot.com/2659042 + +M ui/gtk/panel.py + +commit acf2a46cdce536945d56ecc2a581fda38470dfe5 +Author: fujiwarat +Date: 2010-10-21 18:44:40 +0900 + + Fix CPU 100% usage with signal.SIGCHLD + +M client/gtk2/ibusimcontext.c +M ui/gtk/panel.py + +commit 15db48fc217cb6e91c91e1819f2347dfdac905e0 +Author: fujiwarat +Date: 2010-10-21 17:30:42 +0900 + + Fix keyval and state in __keycode_button_clicked_cb + +M data/ibus.schemas.in +M setup/keyboardshortcut.py + +commit 96b64a2eff1fb4c9bec4e712b47b23a7900f44e7 +Author: Peng Huang +Date: 2010-10-21 17:27:12 +0900 + + Destroy existing connection before creating a new connection, and only create the fake context once. + + BUG=chromium-os:7998 + TEST=manual + + Review URL: http://codereview.appspot.com/2640041 + +M client/gtk2/ibusimcontext.c +M src/ibusbus.c + +commit 8c131cfee02c9104495f11456eb40dc162458a2f +Author: Yusuke Sato +Date: 2010-10-21 13:27:06 +0900 + + Move the candidate window just above the cursor when the window and a preedit string overlap. + + BUG=http://code.google.com/p/ibus/issues/detail?id=1106 + TEST=manually done. + + Review URL: http://codereview.appspot.com/2599041 + +M ui/gtk/candidatepanel.py +M ui/gtk/panel.py + +commit 1c2b65dd3fde6891eff44b7b3bf3371897e3a582 +Author: Yusuke Sato +Date: 2010-10-21 10:35:07 +0900 + + Remove compiler warnings. + + BUG=none + TEST=checked by ./autogen.sh && make + + Review URL: http://codereview.appspot.com/2632041 + +M bus/ibusimpl.c + +commit 9ae13a3d95c7dc775084c58339e42375622df83e +Author: Yusuke Sato +Date: 2010-10-20 22:21:00 +0900 + + Enable key snooper by default again, except Chrome/Chromium browsers, to fix application compatibility issues like 1068. + + This change is logically a revert of http://github.com/ibus/ibus/commit/7e715146794d5fa5324885f8d1dcebb8805bc31b + + The new behavior is: + + 1) If IBUS_DISABLE_SNOOPER environment variable is set, and the value of the variable is "" (an empty string) or "0" or "false" or "False" or "FALSE", key snooper is enabled. + 2) If IBUS_DISABLE_SNOOPER environment variable is set, and the value of the variable is other than the 5 above, e.g. "1", "true", .., key snooper is disabled. + 3) If IBUS_DISABLE_SNOOPER environment variable is not set, and ibus-daemon is explicitly configured with --disable-key-snooper, key snooper is disabled. + 4) If IBUS_DISABLE_SNOOPER environment variable is not set, and ibus-daemon is not configured with --disable-key-snooper, the GTK_IM_MODULE, im-ibus.so, checks IBUS_NO_SNOOPER_APPS environment variable: + 4-a) if IBUS_NO_SNOOPER_APPS environment variable is not set, and the application name matches ".*chrome", key snooper is disabled. + 4-b) if IBUS_NO_SNOOPER_APPS environment variable, which should be comma-separated regexps, is set, and one of the regexps matches the application name, key snooper is disabled. + 4-c) otherwise, key snooper is enabled. + + Please note that when no configure options nor no environment variables are set, key snooper is enabled on all applications except Chrome/Chromium web browsers. For example, key snooper would be enabled on xchat and gedit by default. I believe the new default behavior would satisfy both Linux desktop and Chromium OS requirements. + + Test: + + - With ibus built without --disable-key-snooper: + + yusukes@harapeko:~$ gedit # snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER= gedit # snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER=0 gedit # snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="0" gedit # snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="false" gedit # snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="False" gedit # snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="FALSE" gedit # snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="1" gedit # no-snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="true" gedit # no-snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="unknownstring" gedit # no-snoop + + yusukes@harapeko:~$ IBUS_NO_SNOOPER_APPS=gedit gedit # no-snoop + yusukes@harapeko:~$ IBUS_NO_SNOOPER_APPS='g.*dit' gedit # no-snoop + yusukes@harapeko:~$ IBUS_NO_SNOOPER_APPS='foobar,g.*dit' gedit # no-snoop + yusukes@harapeko:~$ IBUS_NO_SNOOPER_APPS=foobar gedit # snoop + + yusukes@harapeko:~$ google-chrome # no-snoop + yusukes@harapeko:~$ IBUS_NO_SNOOPER_APPS=foobar google-chrome # snoop + + - With ibus built with --disable-key-snooper: + + yusukes@harapeko:~$ gedit # no-snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="false" gedit # snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="true" gedit # no-snoop + yusukes@harapeko:~$ IBUS_DISABLE_SNOOPER="unknownstring" gedit # no-snoop + yusukes@harapeko:~$ IBUS_NO_SNOOPER_APPS=foobar gedit # no-snoop, because IBUS_NO_SNOOPER_APPS is ignored when --disable-key-snooper is specified. + + BUG=http://code.google.com/p/ibus/issues/detail?id=1068 + TEST=manually done. see above. + + Review URL: http://codereview.appspot.com/2568043 + +M client/gtk2/ibusimcontext.c +M configure.ac + +commit 4be55968e7f98d1b042068b47be82395715bf9bc +Author: Peng Huang +Date: 2010-10-20 20:53:36 +0900 + + Always consume the hotkey, even if the hotkey associated engine already activated. + + BUG=6376 + TEST=manual + + Review URL: http://codereview.appspot.com/2596042 + +M bus/ibusimpl.c + +commit 2100c1f781fec3a2157e57514d413a977042d84c +Author: Yusuke Sato +Date: 2010-10-19 20:30:09 +0900 + + Fix race condition in bus_ibus_impl_create_engine() + + If the bus_ibus_impl_create_engine() function is called right after an ibus_component_start() call, the function might fail getting a factory object. + + To avoid the problem, we should use the busy-wait logic even when ibus_component_is_running() returns true. + + BUG=http://crosbug.com/7244 + TEST=see the bug (comment #4,7,9) + + Review URL: http://codereview.appspot.com/2562041 + +M bus/ibusimpl.c + +commit 65fb5ea4f009d29c688b2be6d87849209beb77fa +Author: fujiwarat +Date: 2010-10-13 14:05:02 +0900 + + Fix a build error of IBus-1.0.gir with gobject-introspection 0.9.6 + +M bus/dbusimpl.h +M bus/main.c +M bus/matchrule.c +M bus/matchrule.h +M bus/server.c +M configure.ac +M src/Makefile.am +M src/ibusdbus.h +M src/ibusenumtypes.c.template +M src/ibuserror.c +M src/ibuserror.h +M src/ibusmessage.h +M src/ibuspendingcall.h + +commit 27d8ca4935b75269ca9480806942819381f5a140 +Author: Peng Huang +Date: 2010-10-13 08:14:58 +0900 + + Fix a typo. + +M ibus/property.py + +commit 53e303cf41236186b43e4e9c9e90c52582c020c0 +Author: Peng Huang +Date: 2010-10-08 10:41:41 +0800 + + Remove unused dbus-1 package in gir includes + + BUG=none + TEST=manual + + Review URL: http://codereview.appspot.com/2331041 + +M src/Makefile.am + +commit bcfa545f0789573e805f721a953c6864f1f62a1b +Author: Hirotake Kobayashi +Date: 2010-10-02 00:45:49 +0900 + + Implement stress tool for ibus. + + A test-stress.c sends key message each time by client. + Client.h and client.c store modifier key and send key event. + They check ibus-daemon and engine is alive. + + Review URL: http://codereview.appspot.com/2204051 + Patch from Hirotake Kobayashi . + +M bus/Makefile.am +A bus/test-client.c +A bus/test-client.h +A bus/test-stress.c + +commit 92f838c697ff9470d403537b22e15d55a403c6e0 +Author: fujiwarat +Date: 2010-09-30 10:58:31 +0900 + + Fix a build error with GTK3 gdkkeysyms.h + +M client/gtk2/ibusimcontext.c + +commit cf48af79ba606352d22238f556cb667c62b4258e +Author: Peng Huang +Date: 2010-09-21 06:57:10 +0800 + + Update gu.po from Sweta Kothari + +M po/gu.po + +commit a0694521739f91666f663e5538f06462e49eef3f +Author: Yusuke Sato +Date: 2010-09-17 22:26:50 +0900 + + Fix g_assertion failure in bus_ibus_impl_{load,save}_global_engine_name functions. + + Add NULL checks to the functions so they don't abort with assertion failure even if the functions are called before the ibus configuration daemon gets ready. + See http://code.google.com/p/chromium-os/issues/detail?id=6689#c27 for details. + +M bus/ibusimpl.c + +commit 1396c4649255efb8c48abe39bf09ef7ffbbed7af +Author: Peng Huang +Date: 2010-09-10 19:04:25 +0800 + + Add some comments about registry + + BUG=none + TEST=built fine + + Review URL: http://codereview.appspot.com/2159046 + +M bus/ibusimpl.c +M bus/registry.c + +commit 37ed695bfcaa764c6fd80d4f3d29f3df9032f83f +Author: Satoru Takabayashi +Date: 2010-09-09 13:24:42 +0900 + + Add Emacs modeline for .c and .h files. + + /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ + + TEST=confirmed that the modelines for vim and emacs both worked. + BUG=none + + Review URL: http://codereview.appspot.com/2168042 + +M bus/connection.c +M bus/connection.h +M bus/dbusimpl.c +M bus/dbusimpl.h +M bus/engineproxy.c +M bus/engineproxy.h +M bus/factoryproxy.c +M bus/factoryproxy.h +M bus/ibusimpl.c +M bus/ibusimpl.h +M bus/inputcontext.c +M bus/inputcontext.h +M bus/main.c +M bus/matchrule.c +M bus/matchrule.h +M bus/option.h +M bus/panelproxy.c +M bus/panelproxy.h +M bus/registry.c +M bus/registry.h +M bus/server.c +M bus/server.h +M bus/test-matchrule.c +M bus/test-registry.c +M client/gtk2/ibusim.c +M client/gtk2/ibusimcontext.c +M client/gtk2/ibusimcontext.h +M client/x11/gdk-private.c +M client/x11/gdk-private.h +M client/x11/locales.h +M client/x11/main.c +M gconf/config.c +M gconf/config.h +M gconf/main.c +M memconf/config.h +M src/ibus.h +M src/ibusattribute.c +M src/ibusattribute.h +M src/ibusattrlist.c +M src/ibusattrlist.h +M src/ibusbus.c +M src/ibusbus.h +M src/ibuscomponent.c +M src/ibuscomponent.h +M src/ibusconfig.c +M src/ibusconfig.h +M src/ibusconfigprivate.h +M src/ibusconfigservice.c +M src/ibusconfigservice.h +M src/ibusconnection.c +M src/ibusconnection.h +M src/ibusdbus.h +M src/ibusdebug.h +M src/ibusengine.c +M src/ibusengine.h +M src/ibusenginedesc.c +M src/ibusenginedesc.h +M src/ibuserror.c +M src/ibuserror.h +M src/ibusfactory.c +M src/ibusfactory.h +M src/ibushotkey.c +M src/ibushotkey.h +M src/ibusinputcontext.c +M src/ibusinputcontext.h +M src/ibusinternal.c +M src/ibusinternal.h +M src/ibuskeymap.c +M src/ibuskeymap.h +M src/ibuskeynames.c +M src/ibuskeysyms.h +M src/ibuslookuptable.c +M src/ibuslookuptable.h +M src/ibusmainloop.c +M src/ibusmainloop.h +M src/ibusmessage.c +M src/ibusmessage.h +M src/ibusobject.c +M src/ibusobject.h +M src/ibusobservedpath.c +M src/ibusobservedpath.h +M src/ibuspanelservice.c +M src/ibuspanelservice.h +M src/ibuspendingcall.c +M src/ibuspendingcall.h +M src/ibusproperty.c +M src/ibusproperty.h +M src/ibusproplist.c +M src/ibusproplist.h +M src/ibusproxy.c +M src/ibusproxy.h +M src/ibusserializable.c +M src/ibusserializable.h +M src/ibusserver.c +M src/ibusserver.h +M src/ibusservice.c +M src/ibusservice.h +M src/ibusshare.c +M src/ibusshare.h +M src/ibustext.c +M src/ibustext.h +M src/ibustypes.h +M src/ibusxml.c +M src/ibusxml.h +M src/test-attribute.c +M src/test-bus.c +M src/test-engine.c +M src/test-global-engine.c +M src/test-keymap.c +M src/test-keynames.c +M src/test-lookuptable.c +M src/test-proxy.c +M src/test-server.c +M src/test-text.c + +commit a751fd3ee3d0273a70d09a616d62b1dbbf3e4cbb +Author: Satoru Takabayashi +Date: 2010-09-09 11:05:55 +0900 + + Move the log handler code from bus/main.cc to src/ibusshare.cc. + + The log handler is useful for IBus client programs. For instance, + the log handler was used inside the chromium browser for debugging + IBus startup issue: + + http://code.google.com/p/chromium-os/issues/detail?id=6375#c29 + + (chrome:11824): IBUS-DEBUG: 00:00:46.929430: The socket file is now created (monitoring done). + + BUG=none + TEST=manually ran ibus-daemon with and without -v + + Review URL: http://codereview.appspot.com/2122047 + +M bus/main.c +M src/ibusshare.c +M src/ibusshare.h + +commit 7c5f46e3e8580d080aac0a25d8e97a0fc7fc70a7 +Author: Satoru Takabayashi +Date: 2010-09-08 15:58:31 +0900 + + Add codereview.settings. + + This is for us to use codereview.appspot.com for code reviews. + + Instructions to use codereview.appspot.com: + + 1. Get depot_tools and add PATH to the directory + http://dev.chromium.org/developers/how-tos/depottools + + 2. In your local IBus git repository, + + % git checkout master + % git checkout -b somefix + make changes + % git cl upload + do code reviews at codereview.appspot.com + once it's done, run "git cl push" if you can commit. + otherwise, ask committers to commit on behalf. + + Review URL: http://codereview.appspot.com/2166043 + +A codereview.settings + +commit f0f50b5b003adfc062fef5781a9646e9eea67d78 +Author: Peng Huang +Date: 2010-09-07 08:35:03 +0800 + + Add time info in log message from satorux@chromium.org + +M bus/main.c + +commit 888189eba783ac014e7c367004a70dad6f7b8ac0 +Author: Peng Huang +Date: 2010-09-06 17:17:24 +0800 + + Fix memory leak in ibus_input_context_process_key_event by Fujiwarat + +M src/ibusinputcontext.c + +commit 85565b7a146e5ccbd484273b647b6195b6c08b03 +Author: fujiwarat +Date: 2010-09-02 12:58:42 +0900 + + Fix segv in bus_engine_proxy_process_key_event_reply_cb + +M bus/engineproxy.c + +commit 0b8d9594d5fb3afa6e988e321d5d124e5da1eee2 +Author: Peng Huang +Date: 2010-09-06 16:16:51 +0800 + + Set CFLAGS to "-Wall -Werror" in autogen.sh + +M autogen.sh + +commit c8794994fde7f52dc29a7b9ebea926e66cf093da +Author: Peng Huang +Date: 2010-08-12 15:22:00 +0800 + + Fix property issue. + +M bus/inputcontext.c + +commit 9bb5c58da874dcd3293476726201a54498fc92e1 +Author: Peng Huang +Date: 2010-08-06 14:02:25 +0800 + + Update fr.po + +M po/fr.po + +commit 733a0b12388aa4cc4092a4f9b4f2cce9e0fd7383 +Author: Peng Huang +Date: 2010-08-05 17:13:56 +0800 + + Fix a build warning + +M bus/ibusimpl.c + commit 19d03011e00db27753aa874c1404a858605b4a87 Author: Peng Huang Date: 2010-08-03 16:59:32 +0800 diff -Nru ibus-1.3.7/client/gtk2/ibusim.c ibus-1.3.8/client/gtk2/ibusim.c --- ibus-1.3.7/client/gtk2/ibusim.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/client/gtk2/ibusim.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et ts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/client/gtk2/ibusimcontext.c ibus-1.3.8/client/gtk2/ibusimcontext.c --- ibus-1.3.7/client/gtk2/ibusimcontext.c 2010-07-30 09:58:04.000000000 +0000 +++ ibus-1.3.8/client/gtk2/ibusimcontext.c 2010-10-21 10:58:58.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -23,6 +24,7 @@ # include #endif +#include #include #include #include @@ -33,6 +35,10 @@ #include #include "ibusimcontext.h" +#if !GTK_CHECK_VERSION (2, 90, 0) +# define DEPRECATED_GDK_KEYSYMS 1 +#endif + #ifdef DEBUG # define IDEBUG g_debug #else @@ -75,8 +81,9 @@ static guint _signal_delete_surrounding_id = 0; static guint _signal_retrieve_surrounding_id = 0; -static const gchar *_snooper_apps = SNOOPER_APPS; +static const gchar *_no_snooper_apps = NO_SNOOPER_APPS; static gboolean _use_key_snooper = ENABLE_SNOOPER; +static guint _key_snooper_id = 0; static GtkIMContext *_focus_im_context = NULL; static IBusInputContext *_fake_context = NULL; @@ -158,7 +165,7 @@ (GInstanceInitFunc) ibus_im_context_init, }; - if (! _ibus_type_im_context ) { + if (!_ibus_type_im_context) { if (type_module) { _ibus_type_im_context = g_type_module_register_type (type_module, @@ -310,32 +317,33 @@ g_signal_lookup ("retrieve-surrounding", G_TYPE_FROM_CLASS (klass)); g_assert (_signal_retrieve_surrounding_id != 0); - const gchar *ibus_snooper = g_getenv ("IBUS_SNOOPER"); - if (ibus_snooper) { - /* env IBUS_SNOOPER exist */ - if (g_strcmp0 (ibus_snooper, "") == 0 || - g_strcmp0 (ibus_snooper, "0") == 0 || - g_strcmp0 (ibus_snooper, "false") == 0 || - g_strcmp0 (ibus_snooper, "FALSE") == 0) { - _use_key_snooper = FALSE; + const gchar *ibus_disable_snooper = g_getenv ("IBUS_DISABLE_SNOOPER"); + if (ibus_disable_snooper) { + /* env IBUS_DISABLE_SNOOPER exist */ + if (g_strcmp0 (ibus_disable_snooper, "") == 0 || + g_strcmp0 (ibus_disable_snooper, "0") == 0 || + g_strcmp0 (ibus_disable_snooper, "false") == 0 || + g_strcmp0 (ibus_disable_snooper, "False") == 0 || + g_strcmp0 (ibus_disable_snooper, "FALSE") == 0) { + _use_key_snooper = TRUE; } else { - _use_key_snooper = TRUE; + _use_key_snooper = FALSE; } } else { - /* env IBUS_SNOOPER does not exist */ - if (!_use_key_snooper) { + /* env IBUS_DISABLE_SNOOPER does not exist */ + if (_use_key_snooper) { /* disable snooper if app is in _no_snooper_apps */ const gchar * prgname = g_get_prgname (); - if (g_getenv ("IBUS_SNOOPER_APPS")) { - _snooper_apps = g_getenv ("IBUS_SNOOPER_APPS"); + if (g_getenv ("IBUS_NO_SNOOPER_APPS")) { + _no_snooper_apps = g_getenv ("IBUS_NO_SNOOPER_APPS"); } gchar **p; - gchar ** apps = g_strsplit (_snooper_apps, ",", 0); + gchar ** apps = g_strsplit (_no_snooper_apps, ",", 0); for (p = apps; *p != NULL; p++) { if (g_regex_match_simple (*p, prgname, 0, 0)) { - _use_key_snooper = TRUE; + _use_key_snooper = FALSE; break; } } @@ -347,15 +355,19 @@ if (_bus == NULL) { ibus_set_display (gdk_display_get_name (gdk_display_get_default ())); _bus = ibus_bus_new(); - } - if (ibus_bus_is_connected (_bus)) { - _create_fake_input_context (); + /* init the global fake context */ + if (ibus_bus_is_connected (_bus)) { + _create_fake_input_context (); + } + + g_signal_connect (_bus, "connected", G_CALLBACK (_bus_connected_cb), NULL); } - g_signal_connect (_bus, "connected", G_CALLBACK (_bus_connected_cb), NULL); + /* always install snooper */ - gtk_key_snooper_install (_key_snooper_cb, NULL); + if (_key_snooper_id == 0) + _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL); } static void @@ -680,6 +692,12 @@ IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context); + if (ibusimcontext->cursor_area.x == area->x && + ibusimcontext->cursor_area.y == area->y && + ibusimcontext->cursor_area.width == area->width && + ibusimcontext->cursor_area.height == area->height) { + return; + } ibusimcontext->cursor_area = *area; _set_cursor_location_internal (context); gtk_im_context_set_cursor_location (ibusimcontext->slave, area); @@ -732,6 +750,7 @@ * really should be implemented */ switch (keyval) { +#ifdef DEPRECATED_GDK_KEYSYMS case GDK_Shift_L: case GDK_Shift_R: case GDK_Control_L: @@ -758,6 +777,34 @@ case GDK_ISO_Group_Latch: case GDK_ISO_Group_Lock: return TRUE; +#else + case GDK_KEY_Shift_L: + case GDK_KEY_Shift_R: + case GDK_KEY_Control_L: + case GDK_KEY_Control_R: + case GDK_KEY_Caps_Lock: + case GDK_KEY_Shift_Lock: + case GDK_KEY_Meta_L: + case GDK_KEY_Meta_R: + case GDK_KEY_Alt_L: + case GDK_KEY_Alt_R: + case GDK_KEY_Super_L: + case GDK_KEY_Super_R: + case GDK_KEY_Hyper_L: + case GDK_KEY_Hyper_R: + case GDK_KEY_ISO_Lock: + case GDK_KEY_ISO_Level2_Latch: + case GDK_KEY_ISO_Level3_Shift: + case GDK_KEY_ISO_Level3_Latch: + case GDK_KEY_ISO_Level3_Lock: + case GDK_KEY_ISO_Level5_Shift: + case GDK_KEY_ISO_Level5_Latch: + case GDK_KEY_ISO_Level5_Lock: + case GDK_KEY_ISO_Group_Shift: + case GDK_KEY_ISO_Group_Latch: + case GDK_KEY_ISO_Group_Lock: + return TRUE; +#endif default: return FALSE; } @@ -788,7 +835,11 @@ event->group = 0; event->is_modifier = _key_is_modifier (keyval); +#ifdef DEPRECATED_GDK_KEYSYMS if (keyval != GDK_VoidSymbol) +#else + if (keyval != GDK_KEY_VoidSymbol) +#endif c = gdk_keyval_to_unicode (keyval); if (c) { @@ -818,12 +869,21 @@ NULL); if (event->string) event->length = bytes_written; +#ifdef DEPRECATED_GDK_KEYSYMS } else if (keyval == GDK_Escape) { +#else + } else if (keyval == GDK_KEY_Escape) { +#endif event->length = 1; event->string = g_strdup ("\033"); } +#ifdef DEPRECATED_GDK_KEYSYMS else if (keyval == GDK_Return || keyval == GDK_KP_Enter) { +#else + else if (keyval == GDK_KEY_Return || + keyval == GDK_KEY_KP_Enter) { +#endif event->length = 1; event->string = g_strdup ("\r"); } diff -Nru ibus-1.3.7/client/gtk2/ibusimcontext.h ibus-1.3.8/client/gtk2/ibusimcontext.h --- ibus-1.3.7/client/gtk2/ibusimcontext.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/client/gtk2/ibusimcontext.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et ts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/client/gtk2/Makefile.in ibus-1.3.8/client/gtk2/Makefile.in --- ibus-1.3.7/client/gtk2/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/client/gtk2/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -207,6 +207,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -265,6 +266,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/client/gtk3/ibusim.c ibus-1.3.8/client/gtk3/ibusim.c --- ibus-1.3.7/client/gtk3/ibusim.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/client/gtk3/ibusim.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et ts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/client/gtk3/ibusimcontext.c ibus-1.3.8/client/gtk3/ibusimcontext.c --- ibus-1.3.7/client/gtk3/ibusimcontext.c 2010-07-30 09:58:04.000000000 +0000 +++ ibus-1.3.8/client/gtk3/ibusimcontext.c 2010-10-21 10:58:58.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -23,6 +24,7 @@ # include #endif +#include #include #include #include @@ -33,6 +35,10 @@ #include #include "ibusimcontext.h" +#if !GTK_CHECK_VERSION (2, 90, 0) +# define DEPRECATED_GDK_KEYSYMS 1 +#endif + #ifdef DEBUG # define IDEBUG g_debug #else @@ -75,8 +81,9 @@ static guint _signal_delete_surrounding_id = 0; static guint _signal_retrieve_surrounding_id = 0; -static const gchar *_snooper_apps = SNOOPER_APPS; +static const gchar *_no_snooper_apps = NO_SNOOPER_APPS; static gboolean _use_key_snooper = ENABLE_SNOOPER; +static guint _key_snooper_id = 0; static GtkIMContext *_focus_im_context = NULL; static IBusInputContext *_fake_context = NULL; @@ -158,7 +165,7 @@ (GInstanceInitFunc) ibus_im_context_init, }; - if (! _ibus_type_im_context ) { + if (!_ibus_type_im_context) { if (type_module) { _ibus_type_im_context = g_type_module_register_type (type_module, @@ -310,32 +317,33 @@ g_signal_lookup ("retrieve-surrounding", G_TYPE_FROM_CLASS (klass)); g_assert (_signal_retrieve_surrounding_id != 0); - const gchar *ibus_snooper = g_getenv ("IBUS_SNOOPER"); - if (ibus_snooper) { - /* env IBUS_SNOOPER exist */ - if (g_strcmp0 (ibus_snooper, "") == 0 || - g_strcmp0 (ibus_snooper, "0") == 0 || - g_strcmp0 (ibus_snooper, "false") == 0 || - g_strcmp0 (ibus_snooper, "FALSE") == 0) { - _use_key_snooper = FALSE; + const gchar *ibus_disable_snooper = g_getenv ("IBUS_DISABLE_SNOOPER"); + if (ibus_disable_snooper) { + /* env IBUS_DISABLE_SNOOPER exist */ + if (g_strcmp0 (ibus_disable_snooper, "") == 0 || + g_strcmp0 (ibus_disable_snooper, "0") == 0 || + g_strcmp0 (ibus_disable_snooper, "false") == 0 || + g_strcmp0 (ibus_disable_snooper, "False") == 0 || + g_strcmp0 (ibus_disable_snooper, "FALSE") == 0) { + _use_key_snooper = TRUE; } else { - _use_key_snooper = TRUE; + _use_key_snooper = FALSE; } } else { - /* env IBUS_SNOOPER does not exist */ - if (!_use_key_snooper) { + /* env IBUS_DISABLE_SNOOPER does not exist */ + if (_use_key_snooper) { /* disable snooper if app is in _no_snooper_apps */ const gchar * prgname = g_get_prgname (); - if (g_getenv ("IBUS_SNOOPER_APPS")) { - _snooper_apps = g_getenv ("IBUS_SNOOPER_APPS"); + if (g_getenv ("IBUS_NO_SNOOPER_APPS")) { + _no_snooper_apps = g_getenv ("IBUS_NO_SNOOPER_APPS"); } gchar **p; - gchar ** apps = g_strsplit (_snooper_apps, ",", 0); + gchar ** apps = g_strsplit (_no_snooper_apps, ",", 0); for (p = apps; *p != NULL; p++) { if (g_regex_match_simple (*p, prgname, 0, 0)) { - _use_key_snooper = TRUE; + _use_key_snooper = FALSE; break; } } @@ -347,15 +355,19 @@ if (_bus == NULL) { ibus_set_display (gdk_display_get_name (gdk_display_get_default ())); _bus = ibus_bus_new(); - } - if (ibus_bus_is_connected (_bus)) { - _create_fake_input_context (); + /* init the global fake context */ + if (ibus_bus_is_connected (_bus)) { + _create_fake_input_context (); + } + + g_signal_connect (_bus, "connected", G_CALLBACK (_bus_connected_cb), NULL); } - g_signal_connect (_bus, "connected", G_CALLBACK (_bus_connected_cb), NULL); + /* always install snooper */ - gtk_key_snooper_install (_key_snooper_cb, NULL); + if (_key_snooper_id == 0) + _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL); } static void @@ -680,6 +692,12 @@ IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context); + if (ibusimcontext->cursor_area.x == area->x && + ibusimcontext->cursor_area.y == area->y && + ibusimcontext->cursor_area.width == area->width && + ibusimcontext->cursor_area.height == area->height) { + return; + } ibusimcontext->cursor_area = *area; _set_cursor_location_internal (context); gtk_im_context_set_cursor_location (ibusimcontext->slave, area); @@ -732,6 +750,7 @@ * really should be implemented */ switch (keyval) { +#ifdef DEPRECATED_GDK_KEYSYMS case GDK_Shift_L: case GDK_Shift_R: case GDK_Control_L: @@ -758,6 +777,34 @@ case GDK_ISO_Group_Latch: case GDK_ISO_Group_Lock: return TRUE; +#else + case GDK_KEY_Shift_L: + case GDK_KEY_Shift_R: + case GDK_KEY_Control_L: + case GDK_KEY_Control_R: + case GDK_KEY_Caps_Lock: + case GDK_KEY_Shift_Lock: + case GDK_KEY_Meta_L: + case GDK_KEY_Meta_R: + case GDK_KEY_Alt_L: + case GDK_KEY_Alt_R: + case GDK_KEY_Super_L: + case GDK_KEY_Super_R: + case GDK_KEY_Hyper_L: + case GDK_KEY_Hyper_R: + case GDK_KEY_ISO_Lock: + case GDK_KEY_ISO_Level2_Latch: + case GDK_KEY_ISO_Level3_Shift: + case GDK_KEY_ISO_Level3_Latch: + case GDK_KEY_ISO_Level3_Lock: + case GDK_KEY_ISO_Level5_Shift: + case GDK_KEY_ISO_Level5_Latch: + case GDK_KEY_ISO_Level5_Lock: + case GDK_KEY_ISO_Group_Shift: + case GDK_KEY_ISO_Group_Latch: + case GDK_KEY_ISO_Group_Lock: + return TRUE; +#endif default: return FALSE; } @@ -788,7 +835,11 @@ event->group = 0; event->is_modifier = _key_is_modifier (keyval); +#ifdef DEPRECATED_GDK_KEYSYMS if (keyval != GDK_VoidSymbol) +#else + if (keyval != GDK_KEY_VoidSymbol) +#endif c = gdk_keyval_to_unicode (keyval); if (c) { @@ -818,12 +869,21 @@ NULL); if (event->string) event->length = bytes_written; +#ifdef DEPRECATED_GDK_KEYSYMS } else if (keyval == GDK_Escape) { +#else + } else if (keyval == GDK_KEY_Escape) { +#endif event->length = 1; event->string = g_strdup ("\033"); } +#ifdef DEPRECATED_GDK_KEYSYMS else if (keyval == GDK_Return || keyval == GDK_KP_Enter) { +#else + else if (keyval == GDK_KEY_Return || + keyval == GDK_KEY_KP_Enter) { +#endif event->length = 1; event->string = g_strdup ("\r"); } diff -Nru ibus-1.3.7/client/gtk3/ibusimcontext.h ibus-1.3.8/client/gtk3/ibusimcontext.h --- ibus-1.3.7/client/gtk3/ibusimcontext.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/client/gtk3/ibusimcontext.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et ts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/client/gtk3/Makefile.in ibus-1.3.8/client/gtk3/Makefile.in --- ibus-1.3.7/client/gtk3/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/client/gtk3/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -207,6 +207,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -265,6 +266,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/client/Makefile.in ibus-1.3.8/client/Makefile.in --- ibus-1.3.7/client/Makefile.in 2010-08-03 09:00:31.000000000 +0000 +++ ibus-1.3.8/client/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -192,6 +192,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -250,6 +251,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/client/x11/gdk-private.c ibus-1.3.8/client/x11/gdk-private.c --- ibus-1.3.7/client/x11/gdk-private.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/client/x11/gdk-private.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* ibus * Copyright (C) 2008 Peng Huang * Copyright (C) 2008 Red Hat, Inc. diff -Nru ibus-1.3.7/client/x11/gdk-private.h ibus-1.3.8/client/x11/gdk-private.h --- ibus-1.3.7/client/x11/gdk-private.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/client/x11/gdk-private.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* ibus * Copyright (C) 2008 Peng Huang * Copyright (C) 2008 Red Hat, Inc. diff -Nru ibus-1.3.7/client/x11/locales.h ibus-1.3.8/client/x11/locales.h --- ibus-1.3.7/client/x11/locales.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/client/x11/locales.h 2010-10-21 10:58:33.000000000 +0000 @@ -1 +1,2 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #define LOCALES_STRING "aa,af,am,an,ar,as,ast,az,be,ber,bg,bn,bo,br,bs,byn,C,ca,crh,cs,csb,cy,da,de,dz,el,en,es,et,eu,fa,fi,fil,fo,fr,fur,fy,ga,gd,gez,gl,gu,gv,ha,he,hi,hne,hr,hsb,ht,hu,hy,id,ig,ik,is,it,iu,iw,ja,ka,kk,kl,km,kn,ko,ks,ku,kw,ky,lg,li,lo,lt,lv,mai,mg,mi,mk,ml,mn,mr,ms,mt,nan,nb,nds,ne,nl,nn,no,nr,nso,oc,om,or,pa,pa,pap,pl,pt,ro,ru,rw,sa,sc,sd,se,shs,si,sid,sk,sl,so,sq,sr,ss,st,sv,ta,te,tg,th,ti,tig,tk,tl,tn,tr,ts,tt,ug,uk,ur,uz,ve,vi,wa,wo,xh,yi,yo,zh,zu" diff -Nru ibus-1.3.7/client/x11/main.c ibus-1.3.8/client/x11/main.c --- ibus-1.3.7/client/x11/main.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/client/x11/main.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus * Copyright (C) 2007-2010 Peng Huang diff -Nru ibus-1.3.7/client/x11/Makefile.in ibus-1.3.8/client/x11/Makefile.in --- ibus-1.3.7/client/x11/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/client/x11/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -190,6 +190,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -248,6 +249,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/config.guess ibus-1.3.8/config.guess --- ibus-1.3.7/config.guess 2010-07-23 09:04:44.000000000 +0000 +++ ibus-1.3.8/config.guess 2010-10-22 05:25:59.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-06-10' +timestamp='2009-12-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +56,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -333,6 +334,9 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -807,12 +811,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) + *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -854,6 +858,20 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -876,6 +894,17 @@ frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -901,39 +930,18 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -942,8 +950,11 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -966,58 +977,6 @@ xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1247,6 +1206,16 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -Nru ibus-1.3.7/config.h.in ibus-1.3.8/config.h.in --- ibus-1.3.7/config.h.in 2010-08-03 09:00:43.000000000 +0000 +++ ibus-1.3.8/config.h.in 2010-10-22 06:16:32.000000000 +0000 @@ -70,6 +70,9 @@ /* Define to 1 if your C compiler doesn't accept -c and -o together. */ #undef NO_MINUS_C_MINUS_O +/* Does not enbale keyboard snooper in those applications */ +#undef NO_SNOOPER_APPS + /* Name of package */ #undef PACKAGE @@ -91,9 +94,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Enbale keyboard snooper in those applications */ -#undef SNOOPER_APPS - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -Nru ibus-1.3.7/config.sub ibus-1.3.8/config.sub --- ibus-1.3.7/config.sub 2010-07-23 09:04:44.000000000 +0000 +++ ibus-1.3.8/config.sub 2010-10-22 05:25:59.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-06-11' +timestamp='2010-01-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -72,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +153,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; @@ -284,6 +288,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -291,13 +296,14 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -340,7 +346,7 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -368,15 +374,17 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* \ + | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -726,6 +734,9 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1076,6 +1087,11 @@ basic_machine=tic6x-unknown os=-coff ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1247,6 +1263,9 @@ # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1268,8 +1287,8 @@ # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1290,7 +1309,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1423,6 +1442,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) diff -Nru ibus-1.3.7/configure ibus-1.3.8/configure --- ibus-1.3.7/configure 2010-08-03 09:00:33.000000000 +0000 +++ ibus-1.3.8/configure 2010-10-22 06:16:26.000000000 +0000 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for ibus 1.3.7. +# Generated by GNU Autoconf 2.67 for ibus 1.3.8. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -319,7 +319,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +359,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -682,7 +682,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='ibus' PACKAGE_TARNAME='ibus' -PACKAGE_VERSION='1.3.7' -PACKAGE_STRING='ibus 1.3.7' +PACKAGE_VERSION='1.3.8' +PACKAGE_STRING='ibus 1.3.8' PACKAGE_BUGREPORT='http://code.google.com/p/ibus/issues/entry' PACKAGE_URL='' @@ -808,6 +808,7 @@ GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK +IBUS_GIR_SCANNERFLAGS HAVE_INTROSPECTION_FALSE HAVE_INTROSPECTION_TRUE INTROSPECTION_MAKEFILE @@ -849,6 +850,8 @@ GLIB_GENMARSHAL GLIB_LIBS GLIB_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG LT_VERSION_INFO DATE_DISPLAY @@ -1037,7 +1040,7 @@ with_gtk3_im_module_dir enable_dbus_python_check enable_key_snooper -with_snooper_apps +with_no_snooper_apps ' ac_precious_vars='build_alias host_alias @@ -1053,6 +1056,8 @@ CCC CXXCPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR GLIB2_CFLAGS GLIB2_LIBS GOBJECT2_CFLAGS @@ -1141,8 +1146,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1187,7 +1193,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1213,7 +1219,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1417,7 +1423,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1433,7 +1439,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1463,8 +1469,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1472,7 +1478,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1490,13 +1496,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1519,7 +1525,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1533,8 +1539,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1549,9 +1555,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1590,11 +1596,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1620,7 +1626,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ibus 1.3.7 to adapt to many kinds of systems. +\`configure' configures ibus 1.3.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1634,7 +1640,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1690,7 +1696,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ibus 1.3.7:";; + short | recursive ) echo "Configuration of ibus 1.3.8:";; esac cat <<\_ACEOF @@ -1727,7 +1733,7 @@ --disable-python Do not use Python code --disable-dbus-python-check Do not check dbus-python - --enable-key-snooper Always enable key snooper in gtk im module + --disable-key-snooper Always disable key snooper in gtk im module Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1744,9 +1750,9 @@ Select gtk2 immodule dir --with-gtk3-im-module-dir=DIR Select gtk3 immodule dir - --with-snooper-apps=regex1,regex2 - Enable keyboard snooper in those applications - (default: xchat,pidgin,empathy) + --with-no-snooper-apps=regex1,regex2 + Does not enable keyboard snooper in those + applications (like: .*chrome.*,firefox.*) Some influential environment variables: CC C compiler command @@ -1761,6 +1767,10 @@ CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path GLIB2_CFLAGS C compiler flags for GLIB2, overriding pkg-config GLIB2_LIBS linker flags for GLIB2, overriding pkg-config @@ -1864,10 +1874,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ibus configure 1.3.7 -generated by GNU Autoconf 2.65 +ibus configure 1.3.8 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1937,7 +1947,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1961,10 +1971,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2000,7 +2010,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -2023,17 +2033,15 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## --------------------------------------------------------- ## +( $as_echo "## --------------------------------------------------------- ## ## Report this to http://code.google.com/p/ibus/issues/entry ## -## --------------------------------------------------------- ## -_ASBOX +## --------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2097,7 +2105,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2211,7 +2219,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2291,7 +2299,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : @@ -2356,8 +2364,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ibus $as_me 1.3.7, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by ibus $as_me 1.3.8, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2467,11 +2475,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2505,11 +2511,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2522,11 +2526,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2540,11 +2542,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2599,7 +2599,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2614,7 +2619,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2690,7 +2699,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2707,16 +2716,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2832,11 +2847,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2858,7 +2873,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2868,7 +2883,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -3106,7 +3121,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -3114,7 +3129,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -3148,7 +3163,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -3164,7 +3179,7 @@ # Define the identity of the package. PACKAGE='ibus' - VERSION='1.3.7' + VERSION='1.3.8' cat >>confdefs.h <<_ACEOF @@ -3566,8 +3581,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3681,9 +3696,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3725,8 +3739,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3783,9 +3797,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3836,8 +3850,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4227,7 +4241,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4243,11 +4257,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4286,7 +4300,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4302,18 +4316,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4374,7 +4388,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4440,7 +4454,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4572,8 +4586,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4664,9 +4677,9 @@ # define PACKAGE_VERSION_* variables - PACKAGE_VERSION_MAJOR=$(echo 1.3.7 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.3.7 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.3.7 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.3.8 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.3.8 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.3.8 | cut -d'.' -f3) @@ -4676,7 +4689,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.3.7 | cut -d'.' -f4) + NANO=$(echo 1.3.8 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -5048,8 +5061,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -5424,7 +5437,7 @@ fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6120,7 +6133,7 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -6131,16 +6144,16 @@ test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -6165,7 +6178,7 @@ ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -6173,7 +6186,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -6246,7 +6259,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -6325,7 +6338,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -6441,7 +6454,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -6643,13 +6656,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6646: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6659: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6649: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6662: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6652: output\"" >&5) + (eval echo "\"\$as_me:6665: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7854,7 +7867,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7857 "configure"' > conftest.$ac_ext + echo '#line 7870 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9041,7 +9054,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -9057,11 +9070,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -9100,7 +9113,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -9116,11 +9129,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else @@ -9613,11 +9626,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9616: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9629: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9620: \$? = $ac_status" >&5 + echo "$as_me:9633: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9952,11 +9965,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9955: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9968: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9959: \$? = $ac_status" >&5 + echo "$as_me:9972: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10057,11 +10070,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10060: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10073: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10064: \$? = $ac_status" >&5 + echo "$as_me:10077: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10112,11 +10125,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10115: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10128: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10119: \$? = $ac_status" >&5 + echo "$as_me:10132: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12496,7 +12509,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12499 "configure" +#line 12512 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12592,7 +12605,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12595 "configure" +#line 12608 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13007,7 +13020,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -14548,11 +14561,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14551: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14564: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14555: \$? = $ac_status" >&5 + echo "$as_me:14568: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14647,11 +14660,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14650: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14663: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14654: \$? = $ac_status" >&5 + echo "$as_me:14667: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14699,11 +14712,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14702: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14715: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14706: \$? = $ac_status" >&5 + echo "$as_me:14719: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15684,7 +15697,7 @@ case "$am__api_version" in 1.01234) - as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; @@ -15701,7 +15714,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -15825,7 +15838,7 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -16107,13 +16120,13 @@ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. @@ -16157,13 +16170,13 @@ if test -z "$INTLTOOL_PERL"; then - as_fn_error "perl not found" "$LINENO" 5 + as_fn_error $? "perl not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 @@ -16176,7 +16189,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -16227,7 +16240,7 @@ # For dislpay Date -DATE_DISPLAY="Tue Aug 03 2010" +DATE_DISPLAY="Fri Oct 22 2010" # If only source code changed, lt_revision + 1 @@ -16299,6 +16312,10 @@ + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -16411,7 +16428,6 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi - fi no_glib="" @@ -16621,11 +16637,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB2" >&5 $as_echo_n "checking for GLIB2... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB2_CFLAGS"; then - pkg_cv_GLIB2_CFLAGS="$GLIB2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GLIB2_CFLAGS"; then + pkg_cv_GLIB2_CFLAGS="$GLIB2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.18 \""; } >&5 @@ -16641,15 +16656,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB2_LIBS"; then - pkg_cv_GLIB2_LIBS="$GLIB2_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GLIB2_LIBS"; then + pkg_cv_GLIB2_LIBS="$GLIB2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.18 \""; } >&5 @@ -16665,14 +16678,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -16680,18 +16694,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " glib-2.0 >= 2.18 -"` +" 2>&1` else - GLIB2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + GLIB2_PKG_ERRORS=`$PKG_CONFIG --print-errors " glib-2.0 >= 2.18 -"` +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB2_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( glib-2.0 >= 2.18 ) were not met: @@ -16702,12 +16716,13 @@ Alternatively, you may set the environment variables GLIB2_CFLAGS and GLIB2_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -16716,24 +16731,23 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GLIB2_CFLAGS=$pkg_cv_GLIB2_CFLAGS GLIB2_LIBS=$pkg_cv_GLIB2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT2" >&5 $as_echo_n "checking for GOBJECT2... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GOBJECT2_CFLAGS"; then - pkg_cv_GOBJECT2_CFLAGS="$GOBJECT2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GOBJECT2_CFLAGS"; then + pkg_cv_GOBJECT2_CFLAGS="$GOBJECT2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gobject-2.0 >= 2.18 \""; } >&5 @@ -16749,15 +16763,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GOBJECT2_LIBS"; then - pkg_cv_GOBJECT2_LIBS="$GOBJECT2_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GOBJECT2_LIBS"; then + pkg_cv_GOBJECT2_LIBS="$GOBJECT2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gobject-2.0 >= 2.18 \""; } >&5 @@ -16773,14 +16785,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -16788,18 +16801,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GOBJECT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + GOBJECT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gobject-2.0 >= 2.18 -"` +" 2>&1` else - GOBJECT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + GOBJECT2_PKG_ERRORS=`$PKG_CONFIG --print-errors " gobject-2.0 >= 2.18 -"` +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GOBJECT2_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( gobject-2.0 >= 2.18 ) were not met: @@ -16810,12 +16823,13 @@ Alternatively, you may set the environment variables GOBJECT2_CFLAGS and GOBJECT2_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -16824,24 +16838,23 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GOBJECT2_CFLAGS=$pkg_cv_GOBJECT2_CFLAGS GOBJECT2_LIBS=$pkg_cv_GOBJECT2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO2" >&5 $as_echo_n "checking for GIO2... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GIO2_CFLAGS"; then - pkg_cv_GIO2_CFLAGS="$GIO2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GIO2_CFLAGS"; then + pkg_cv_GIO2_CFLAGS="$GIO2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gio-2.0 >= 2.18 \""; } >&5 @@ -16857,15 +16870,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GIO2_LIBS"; then - pkg_cv_GIO2_LIBS="$GIO2_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GIO2_LIBS"; then + pkg_cv_GIO2_LIBS="$GIO2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gio-2.0 >= 2.18 \""; } >&5 @@ -16881,14 +16892,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -16896,18 +16908,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + GIO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gio-2.0 >= 2.18 -"` +" 2>&1` else - GIO2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + GIO2_PKG_ERRORS=`$PKG_CONFIG --print-errors " gio-2.0 >= 2.18 -"` +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO2_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( gio-2.0 >= 2.18 ) were not met: @@ -16918,12 +16930,13 @@ Alternatively, you may set the environment variables GIO2_CFLAGS and GIO2_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -16932,24 +16945,23 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GIO2_CFLAGS=$pkg_cv_GIO2_CFLAGS GIO2_LIBS=$pkg_cv_GIO2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD2" >&5 $as_echo_n "checking for GTHREAD2... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTHREAD2_CFLAGS"; then - pkg_cv_GTHREAD2_CFLAGS="$GTHREAD2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTHREAD2_CFLAGS"; then + pkg_cv_GTHREAD2_CFLAGS="$GTHREAD2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gthread-2.0 >= 2.18 \""; } >&5 @@ -16965,15 +16977,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTHREAD2_LIBS"; then - pkg_cv_GTHREAD2_LIBS="$GTHREAD2_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTHREAD2_LIBS"; then + pkg_cv_GTHREAD2_LIBS="$GTHREAD2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gthread-2.0 >= 2.18 \""; } >&5 @@ -16989,14 +16999,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17004,18 +17015,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTHREAD2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + GTHREAD2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gthread-2.0 >= 2.18 -"` +" 2>&1` else - GTHREAD2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + GTHREAD2_PKG_ERRORS=`$PKG_CONFIG --print-errors " gthread-2.0 >= 2.18 -"` +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTHREAD2_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( gthread-2.0 >= 2.18 ) were not met: @@ -17026,12 +17037,13 @@ Alternatively, you may set the environment variables GTHREAD2_CFLAGS and GTHREAD2_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -17040,13 +17052,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GTHREAD2_CFLAGS=$pkg_cv_GTHREAD2_CFLAGS GTHREAD2_LIBS=$pkg_cv_GTHREAD2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi # Check whether --enable-gtk2 was given. @@ -17127,11 +17139,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5 $as_echo_n "checking for GTK2... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTK2_CFLAGS"; then - pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTK2_CFLAGS"; then + pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gtk+-2.0 \""; } >&5 @@ -17147,15 +17158,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTK2_LIBS"; then - pkg_cv_GTK2_LIBS="$GTK2_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTK2_LIBS"; then + pkg_cv_GTK2_LIBS="$GTK2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gtk+-2.0 \""; } >&5 @@ -17171,14 +17180,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17186,18 +17196,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gtk+-2.0 - "` + " 2>&1` else - GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + GTK2_PKG_ERRORS=`$PKG_CONFIG --print-errors " gtk+-2.0 - "` + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK2_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( gtk+-2.0 ) were not met: @@ -17208,12 +17218,13 @@ Alternatively, you may set the environment variables GTK2_CFLAGS and GTK2_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -17222,13 +17233,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS GTK2_LIBS=$pkg_cv_GTK2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi fi @@ -17242,11 +17253,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK2" >&5 $as_echo_n "checking for GDK2... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GDK2_CFLAGS"; then - pkg_cv_GDK2_CFLAGS="$GDK2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GDK2_CFLAGS"; then + pkg_cv_GDK2_CFLAGS="$GDK2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gdk-2.0 \""; } >&5 @@ -17262,15 +17272,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GDK2_LIBS"; then - pkg_cv_GDK2_LIBS="$GDK2_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GDK2_LIBS"; then + pkg_cv_GDK2_LIBS="$GDK2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gdk-2.0 \""; } >&5 @@ -17286,14 +17294,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17301,18 +17310,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GDK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + GDK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gdk-2.0 - "` + " 2>&1` else - GDK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + GDK2_PKG_ERRORS=`$PKG_CONFIG --print-errors " gdk-2.0 - "` + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GDK2_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( gdk-2.0 ) were not met: @@ -17323,12 +17332,13 @@ Alternatively, you may set the environment variables GDK2_CFLAGS and GDK2_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -17337,13 +17347,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GDK2_CFLAGS=$pkg_cv_GDK2_CFLAGS GDK2_LIBS=$pkg_cv_GDK2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi else enable_gtk2="no (disabled, use --enable-gtk2 to enable)" @@ -17356,11 +17366,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3" >&5 $as_echo_n "checking for GTK3... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTK3_CFLAGS"; then - pkg_cv_GTK3_CFLAGS="$GTK3_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTK3_CFLAGS"; then + pkg_cv_GTK3_CFLAGS="$GTK3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gtk+-3.0 \""; } >&5 @@ -17376,15 +17385,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTK3_LIBS"; then - pkg_cv_GTK3_LIBS="$GTK3_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTK3_LIBS"; then + pkg_cv_GTK3_LIBS="$GTK3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gtk+-3.0 \""; } >&5 @@ -17400,14 +17407,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17415,18 +17423,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + GTK3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gtk+-3.0 - "` + " 2>&1` else - GTK3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + GTK3_PKG_ERRORS=`$PKG_CONFIG --print-errors " gtk+-3.0 - "` + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK3_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( gtk+-3.0 ) were not met: @@ -17437,12 +17445,13 @@ Alternatively, you may set the environment variables GTK3_CFLAGS and GTK3_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -17451,13 +17460,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GTK3_CFLAGS=$pkg_cv_GTK3_CFLAGS GTK3_LIBS=$pkg_cv_GTK3_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` @@ -17468,11 +17477,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK3" >&5 $as_echo_n "checking for GDK3... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GDK3_CFLAGS"; then - pkg_cv_GDK3_CFLAGS="$GDK3_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GDK3_CFLAGS"; then + pkg_cv_GDK3_CFLAGS="$GDK3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gdk-3.0 \""; } >&5 @@ -17488,15 +17496,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GDK3_LIBS"; then - pkg_cv_GDK3_LIBS="$GDK3_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GDK3_LIBS"; then + pkg_cv_GDK3_LIBS="$GDK3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gdk-3.0 \""; } >&5 @@ -17512,14 +17518,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17527,18 +17534,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GDK3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + GDK3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gdk-3.0 - "` + " 2>&1` else - GDK3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + GDK3_PKG_ERRORS=`$PKG_CONFIG --print-errors " gdk-3.0 - "` + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GDK3_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( gdk-3.0 ) were not met: @@ -17549,12 +17556,13 @@ Alternatively, you may set the environment variables GDK3_CFLAGS and GDK3_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -17563,13 +17571,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GDK3_CFLAGS=$pkg_cv_GDK3_CFLAGS GDK3_LIBS=$pkg_cv_GDK3_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi else enable_gtk3="no (disabled, use --enable-gtk3 to enable)" @@ -17582,11 +17590,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 $as_echo_n "checking for X11... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$X11_CFLAGS"; then - pkg_cv_X11_CFLAGS="$X11_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$X11_CFLAGS"; then + pkg_cv_X11_CFLAGS="$X11_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" x11 \""; } >&5 @@ -17602,15 +17609,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$X11_LIBS"; then - pkg_cv_X11_LIBS="$X11_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$X11_LIBS"; then + pkg_cv_X11_LIBS="$X11_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" x11 \""; } >&5 @@ -17626,14 +17631,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17641,18 +17647,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " x11 - "` + " 2>&1` else - X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + X11_PKG_ERRORS=`$PKG_CONFIG --print-errors " x11 - "` + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$X11_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( x11 ) were not met: @@ -17663,12 +17669,13 @@ Alternatively, you may set the environment variables X11_CFLAGS and X11_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -17677,13 +17684,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else X11_CFLAGS=$pkg_cv_X11_CFLAGS X11_LIBS=$pkg_cv_X11_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi for ac_header in X11/XKBlib.h do : @@ -17729,7 +17736,7 @@ test $ac_status = 0; }; then : else - as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5 + as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 fi if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.8\""; } >&5 @@ -17739,7 +17746,7 @@ test $ac_status = 0; }; then found_introspection=yes else - as_fn_error "You need to have gobject-introspection >= 0.6.8 installed to build ibus" "$LINENO" 5 + as_fn_error $? "You need to have gobject-introspection >= 0.6.8 installed to build ibus" "$LINENO" 5 fi ;; #( auto) : @@ -17755,7 +17762,7 @@ fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 @@ -17796,6 +17803,25 @@ +IBUS_GIR_SCANNERFLAGS= +if test x"$found_introspection" = x"yes" ; then + IBUS_GIR_SCANNERFLAGS="--identifier-prefix=IBus --symbol-prefix=ibus" + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.6") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gir_symbol_prefix=yes +else + gir_symbol_prefix=no +fi + if test x"$gir_symbol_prefix" = x"no" ; then + IBUS_GIR_SCANNERFLAGS="--strip-prefix=IBus" + fi +fi + + # check for gtk-doc @@ -17954,7 +17980,7 @@ test $ac_status = 0; }; then : else - as_fn_error "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5 + as_fn_error $? "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5 fi fi @@ -18033,11 +18059,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 $as_echo_n "checking for DBUS... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" dbus-1 \""; } >&5 @@ -18053,15 +18078,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DBUS_LIBS"; then + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" dbus-1 \""; } >&5 @@ -18077,14 +18100,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -18092,18 +18116,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " dbus-1 -"` +" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors " dbus-1 -"` +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( dbus-1 ) were not met: @@ -18114,12 +18138,13 @@ Alternatively, you may set the environment variables DBUS_CFLAGS and DBUS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -18128,13 +18153,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi # Check whether --enable-gconf was given. @@ -18161,11 +18186,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5 $as_echo_n "checking for GCONF... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GCONF_CFLAGS"; then - pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GCONF_CFLAGS"; then + pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.12\""; } >&5 ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.12") 2>&5 ac_status=$? @@ -18175,15 +18199,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GCONF_LIBS"; then - pkg_cv_GCONF_LIBS="$GCONF_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GCONF_LIBS"; then + pkg_cv_GCONF_LIBS="$GCONF_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.12\""; } >&5 ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.12") 2>&5 ac_status=$? @@ -18193,14 +18215,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -18208,14 +18231,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0 >= 2.12"` + GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= 2.12" 2>&1` else - GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= 2.12"` + GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= 2.12" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GCONF_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gconf-2.0 >= 2.12) were not met: + as_fn_error $? "Package requirements (gconf-2.0 >= 2.12) were not met: $GCONF_PKG_ERRORS @@ -18224,12 +18247,13 @@ Alternatively, you may set the environment variables GCONF_CFLAGS and GCONF_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -18238,13 +18262,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS GCONF_LIBS=$pkg_cv_GCONF_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi # Extract the first word of "gconftool-2", so it can be a program name with args. @@ -18289,7 +18313,7 @@ if test x"$GCONFTOOL" = xno; then - as_fn_error "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 + as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 fi @@ -18329,7 +18353,7 @@ if test "${enable_schemas_install+set}" = set; then : enableval=$enable_schemas_install; case ${enableval} in yes|no) ;; - *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; esac fi @@ -18460,7 +18484,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error "too old" "$LINENO" 5 + as_fn_error $? "too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else @@ -18544,7 +18568,7 @@ if test "$PYTHON" = :; then - as_fn_error "no suitable Python interpreter found" "$LINENO" 5 + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 else @@ -19511,11 +19535,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_PYTHON" >&5 $as_echo_n "checking for DBUS_PYTHON... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$DBUS_PYTHON_CFLAGS"; then - pkg_cv_DBUS_PYTHON_CFLAGS="$DBUS_PYTHON_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DBUS_PYTHON_CFLAGS"; then + pkg_cv_DBUS_PYTHON_CFLAGS="$DBUS_PYTHON_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-python >= 0.83.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-python >= 0.83.0") 2>&5 ac_status=$? @@ -19525,15 +19548,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$DBUS_PYTHON_LIBS"; then - pkg_cv_DBUS_PYTHON_LIBS="$DBUS_PYTHON_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DBUS_PYTHON_LIBS"; then + pkg_cv_DBUS_PYTHON_LIBS="$DBUS_PYTHON_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-python >= 0.83.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-python >= 0.83.0") 2>&5 ac_status=$? @@ -19543,14 +19564,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19558,18 +19580,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-python >= 0.83.0"` + DBUS_PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-python >= 0.83.0" 2>&1` else - DBUS_PYTHON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-python >= 0.83.0"` + DBUS_PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-python >= 0.83.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PYTHON_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - IBUS_HAS_DBUS_PYTHON=no + IBUS_HAS_DBUS_PYTHON=no elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } IBUS_HAS_DBUS_PYTHON=no else @@ -19581,7 +19603,7 @@ fi if test x"$IBUS_HAS_DBUS_PYTHON" != x"yes"; then if test x"$enable_dbus_python_check" != x"no"; then - as_fn_error "can not find dbus-python >= 0.83.0. Please install or update dbus-python." "$LINENO" 5 + as_fn_error $? "can not find dbus-python >= 0.83.0. Please install or update dbus-python." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can not find dbus-python >= 0.83.0. It is required." >&5 $as_echo "$as_me: WARNING: can not find dbus-python >= 0.83.0. It is required." >&2;} @@ -19589,12 +19611,12 @@ fi fi -# option for always enable snooper applications +# option for always disable snooper applications # Check whether --enable-key-snooper was given. if test "${enable_key_snooper+set}" = set; then : enableval=$enable_key_snooper; enable_key_snooper=$enableval else - enable_key_snooper=no + enable_key_snooper=yes fi @@ -19611,17 +19633,17 @@ # option for no snooper applications -# Check whether --with-snooper-apps was given. -if test "${with_snooper_apps+set}" = set; then : - withval=$with_snooper_apps; SNOOPER_APPS=$with_snooper_apps +# Check whether --with-no-snooper-apps was given. +if test "${with_no_snooper_apps+set}" = set; then : + withval=$with_no_snooper_apps; NO_SNOOPER_APPS=$with_no_snooper_apps else - SNOOPER_APPS=xchat,pidgin,empathy + NO_SNOOPER_APPS=.*chrome fi cat >>confdefs.h <<_ACEOF -#define SNOOPER_APPS "$SNOOPER_APPS" +#define NO_SNOOPER_APPS "$NO_SNOOPER_APPS" _ACEOF @@ -19631,11 +19653,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ISOCODES" >&5 $as_echo_n "checking for ISOCODES... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$ISOCODES_CFLAGS"; then - pkg_cv_ISOCODES_CFLAGS="$ISOCODES_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$ISOCODES_CFLAGS"; then + pkg_cv_ISOCODES_CFLAGS="$ISOCODES_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" iso-codes \""; } >&5 @@ -19651,15 +19672,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$ISOCODES_LIBS"; then - pkg_cv_ISOCODES_LIBS="$ISOCODES_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$ISOCODES_LIBS"; then + pkg_cv_ISOCODES_LIBS="$ISOCODES_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" iso-codes \""; } >&5 @@ -19675,14 +19694,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19690,18 +19710,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ISOCODES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + ISOCODES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " iso-codes -"` +" 2>&1` else - ISOCODES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + ISOCODES_PKG_ERRORS=`$PKG_CONFIG --print-errors " iso-codes -"` +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ISOCODES_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( + as_fn_error $? "Package requirements ( iso-codes ) were not met: @@ -19712,12 +19732,13 @@ Alternatively, you may set the environment variables ISOCODES_CFLAGS and ISOCODES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -19726,13 +19747,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else ISOCODES_CFLAGS=$pkg_cv_ISOCODES_CFLAGS ISOCODES_LIBS=$pkg_cv_ISOCODES_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi ISOCODES_PREFIX=`pkg-config iso-codes --variable=prefix` @@ -19824,6 +19845,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -19847,27 +19869,27 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -19875,63 +19897,63 @@ if test -z "${ENABLE_GTK2_TRUE}" && test -z "${ENABLE_GTK2_FALSE}"; then - as_fn_error "conditional \"ENABLE_GTK2\" was never defined. + as_fn_error $? "conditional \"ENABLE_GTK2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GTK3_TRUE}" && test -z "${ENABLE_GTK3_FALSE}"; then - as_fn_error "conditional \"ENABLE_GTK3\" was never defined. + as_fn_error $? "conditional \"ENABLE_GTK3\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_XIM_TRUE}" && test -z "${ENABLE_XIM_FALSE}"; then - as_fn_error "conditional \"ENABLE_XIM\" was never defined. + as_fn_error $? "conditional \"ENABLE_XIM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_VALA_TRUE}" && test -z "${ENABLE_VALA_FALSE}"; then - as_fn_error "conditional \"ENABLE_VALA\" was never defined. + as_fn_error $? "conditional \"ENABLE_VALA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then - as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined. + as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then - as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. + as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GCONF_TRUE}" && test -z "${ENABLE_GCONF_FALSE}"; then - as_fn_error "conditional \"ENABLE_GCONF\" was never defined. + as_fn_error $? "conditional \"ENABLE_GCONF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_MEMCONF_TRUE}" && test -z "${ENABLE_MEMCONF_FALSE}"; then - as_fn_error "conditional \"ENABLE_MEMCONF\" was never defined. + as_fn_error $? "conditional \"ENABLE_MEMCONF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_PYTHON_TRUE}" && test -z "${ENABLE_PYTHON_FALSE}"; then - as_fn_error "conditional \"ENABLE_PYTHON\" was never defined. + as_fn_error $? "conditional \"ENABLE_PYTHON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -20081,19 +20103,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -20289,7 +20311,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -20342,8 +20364,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ibus $as_me 1.3.7, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by ibus $as_me 1.3.8, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -20408,11 +20430,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ibus config.status 1.3.7 -configured by $0, generated by GNU Autoconf 2.65, +ibus config.status 1.3.8 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -20430,11 +20452,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -20456,6 +20483,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -20468,7 +20496,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -20477,7 +20505,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -20926,7 +20954,7 @@ "bindings/vala/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -20964,7 +20992,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -20981,7 +21009,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -20995,18 +21023,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -21095,20 +21123,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -21136,7 +21172,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -21221,7 +21257,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -21234,7 +21270,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -21262,7 +21298,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -21289,7 +21325,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -21426,22 +21462,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -21452,19 +21488,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -22411,7 +22447,7 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -22439,7 +22475,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -22460,7 +22496,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 @@ -22482,10 +22518,11 @@ Build gconf modules $enable_gconf Build memconf modules $enable_memconf Build introspection $found_introspection + IBus-1.0.gir scannerflags \"$IBUS_GIR_SCANNERFLAGS\" Build vala binding $enable_vala Build document $enable_gtk_doc Enable key snooper $enable_key_snooper - Snooper regexes \"$SNOOPER_APPS\" + No snooper regexes \"$NO_SNOOPER_APPS\" " >&5 $as_echo " Build options: @@ -22502,9 +22539,10 @@ Build gconf modules $enable_gconf Build memconf modules $enable_memconf Build introspection $found_introspection + IBus-1.0.gir scannerflags \"$IBUS_GIR_SCANNERFLAGS\" Build vala binding $enable_vala Build document $enable_gtk_doc Enable key snooper $enable_key_snooper - Snooper regexes \"$SNOOPER_APPS\" + No snooper regexes \"$NO_SNOOPER_APPS\" " >&6; } diff -Nru ibus-1.3.7/configure.ac ibus-1.3.8/configure.ac --- ibus-1.3.7/configure.ac 2010-08-03 08:59:30.000000000 +0000 +++ ibus-1.3.8/configure.ac 2010-10-22 06:16:00.000000000 +0000 @@ -24,7 +24,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [3]) -m4_define([ibus_micro_version], [7]) +m4_define([ibus_micro_version], [8]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -171,6 +171,18 @@ # GObject introspection GOBJECT_INTROSPECTION_CHECK([0.6.8]) +IBUS_GIR_SCANNERFLAGS= +if test x"$found_introspection" = x"yes" ; then + IBUS_GIR_SCANNERFLAGS="--identifier-prefix=IBus --symbol-prefix=ibus" + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.9.6], + [gir_symbol_prefix=yes], + [gir_symbol_prefix=no]) + if test x"$gir_symbol_prefix" = x"no" ; then + IBUS_GIR_SCANNERFLAGS="--strip-prefix=IBus" + fi +fi +AC_SUBST(IBUS_GIR_SCANNERFLAGS) + # check for gtk-doc GTK_DOC_CHECK(1.9) if test x"$enable_gtk_doc" = x"no"; then @@ -299,12 +311,12 @@ fi fi -# option for always enable snooper applications +# option for always disable snooper applications AC_ARG_ENABLE(key-snooper, - AS_HELP_STRING([--enable-key-snooper], - [Always enable key snooper in gtk im module]), + AS_HELP_STRING([--disable-key-snooper], + [Always disable key snooper in gtk im module]), [enable_key_snooper=$enableval], - [enable_key_snooper=no] + [enable_key_snooper=yes] ) if test x"$enable_key_snooper" = x"yes"; then AC_DEFINE(ENABLE_SNOOPER, TRUE, [Enable key snooper]) @@ -314,14 +326,14 @@ fi # option for no snooper applications -AC_ARG_WITH(snooper-apps, - AS_HELP_STRING([--with-snooper-apps[=regex1,regex2]], - [Enable keyboard snooper in those applications (default: xchat,pidgin,empathy)]), - SNOOPER_APPS=$with_snooper_apps, - SNOOPER_APPS=[xchat,pidgin,empathy] +AC_ARG_WITH(no-snooper-apps, + AS_HELP_STRING([--with-no-snooper-apps[=regex1,regex2]], + [Does not enable keyboard snooper in those applications (like: .*chrome.*,firefox.*)]), + NO_SNOOPER_APPS=$with_no_snooper_apps, + NO_SNOOPER_APPS=.*chrome ) -AC_DEFINE_UNQUOTED(SNOOPER_APPS, "$SNOOPER_APPS", - [Enbale keyboard snooper in those applications]) +AC_DEFINE_UNQUOTED(NO_SNOOPER_APPS, "$NO_SNOOPER_APPS", + [Does not enbale keyboard snooper in those applications]) # check iso-codes PKG_CHECK_MODULES(ISOCODES, [ @@ -386,9 +398,10 @@ Build gconf modules $enable_gconf Build memconf modules $enable_memconf Build introspection $found_introspection + IBus-1.0.gir scannerflags "$IBUS_GIR_SCANNERFLAGS" Build vala binding $enable_vala Build document $enable_gtk_doc Enable key snooper $enable_key_snooper - Snooper regexes "$SNOOPER_APPS" + No snooper regexes "$NO_SNOOPER_APPS" ]) diff -Nru ibus-1.3.7/data/ibus.schemas.in ibus-1.3.8/data/ibus.schemas.in --- ibus-1.3.7/data/ibus.schemas.in 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/data/ibus.schemas.in 2010-10-21 10:58:33.000000000 +0000 @@ -18,7 +18,7 @@ ibus list string - [Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul,Alt+Release+Alt_R] + [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 diff -Nru ibus-1.3.7/data/icons/Makefile.in ibus-1.3.8/data/icons/Makefile.in --- ibus-1.3.7/data/icons/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/data/icons/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -185,6 +185,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -243,6 +244,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/data/keymaps/Makefile.in ibus-1.3.8/data/keymaps/Makefile.in --- ibus-1.3.7/data/keymaps/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/data/keymaps/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -214,6 +214,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -272,6 +273,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/data/Makefile.in ibus-1.3.8/data/Makefile.in --- ibus-1.3.7/data/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/data/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -216,6 +216,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,6 +275,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/debian/changelog ibus-1.3.8/debian/changelog --- ibus-1.3.7/debian/changelog 2010-08-14 10:12:24.000000000 +0000 +++ ibus-1.3.8/debian/changelog 2010-10-25 15:49:01.000000000 +0000 @@ -1,8 +1,13 @@ -ibus (1.3.7-1~ppa1) karmic; urgency=low +ibus (1.3.8-1~ppa1) lucid; urgency=low + [ LI Daobing ] * fix typo in debian/changelog - -- LI Daobing Sat, 14 Aug 2010 18:12:06 +0800 + [ Asias He ] + * New upstream release. + * debian/contro: drop Depends python-glade2 (closes: #599301) + + -- LI Daobing Mon, 25 Oct 2010 23:48:50 +0800 ibus (1.3.7-1) unstable; urgency=low diff -Nru ibus-1.3.7/debian/control ibus-1.3.8/debian/control --- ibus-1.3.7/debian/control 2010-08-04 12:50:33.000000000 +0000 +++ ibus-1.3.8/debian/control 2010-10-25 15:18:43.000000000 +0000 @@ -27,7 +27,7 @@ Package: ibus Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-glade2, +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-ibus (= ${source:Version}), python-xdg, librsvg2-common, python-notify Recommends: im-config | im-switch, ibus-gtk | ibus-qt4 Conflicts: ibus-anthy (<< 1.2), diff -Nru ibus-1.3.7/debian/libibus2.symbols ibus-1.3.8/debian/libibus2.symbols --- ibus-1.3.7/debian/libibus2.symbols 2010-08-04 12:50:33.000000000 +0000 +++ ibus-1.3.8/debian/libibus2.symbols 2010-10-25 15:18:43.000000000 +0000 @@ -347,6 +347,7 @@ ibus_service_remove_from_connection@Base 1.2.99.20100202 ibus_service_send_signal@Base 1.2.99.20100202 ibus_set_display@Base 1.2.99.20100202 + ibus_set_log_handler@Base 1.3.8 ibus_text_append_attribute@Base 1.2.99.20100202 ibus_text_get_length@Base 1.2.99.20100202 ibus_text_get_type@Base 1.2.99.20100202 diff -Nru ibus-1.3.7/docs/Makefile.in ibus-1.3.8/docs/Makefile.in --- ibus-1.3.7/docs/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/docs/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -192,6 +192,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -250,6 +251,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/docs/reference/ibus/html/ch01.html ibus-1.3.8/docs/reference/ibus/html/ch01.html --- ibus-1.3.7/docs/reference/ibus/html/ch01.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ch01.html 2010-10-22 06:16:35.000000000 +0000 @@ -21,7 +21,7 @@

-Overview

+Overview

This manual is the API specification for the IBus. IBus is built upon GObject and D-Bus, so you may find that modules are named as classes and objects in the sense of GObject, diff -Nru ibus-1.3.7/docs/reference/ibus/html/ch02.html ibus-1.3.8/docs/reference/ibus/html/ch02.html --- ibus-1.3.7/docs/reference/ibus/html/ch02.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ch02.html 2010-10-22 06:16:35.000000000 +0000 @@ -21,7 +21,7 @@

-Panel (User Interfaces)

+Panel (User Interfaces)
IBusAttribute — Attributes of IBusText. diff -Nru ibus-1.3.7/docs/reference/ibus/html/ch03.html ibus-1.3.8/docs/reference/ibus/html/ch03.html --- ibus-1.3.7/docs/reference/ibus/html/ch03.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ch03.html 2010-10-22 06:16:35.000000000 +0000 @@ -21,7 +21,7 @@

-Input method engine

+Input method engine
IBusComponent — Component (executable) specification. diff -Nru ibus-1.3.7/docs/reference/ibus/html/ch04.html ibus-1.3.8/docs/reference/ibus/html/ch04.html --- ibus-1.3.7/docs/reference/ibus/html/ch04.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ch04.html 2010-10-22 06:16:35.000000000 +0000 @@ -21,7 +21,7 @@

-Configuration

+Configuration
IBusConfig — IBus engine configuration module. diff -Nru ibus-1.3.7/docs/reference/ibus/html/ch05.html ibus-1.3.8/docs/reference/ibus/html/ch05.html --- ibus-1.3.7/docs/reference/ibus/html/ch05.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ch05.html 2010-10-22 06:16:35.000000000 +0000 @@ -21,7 +21,7 @@

-Communication

+Communication
IBusBus — Connect with IBus daemon. diff -Nru ibus-1.3.7/docs/reference/ibus/html/ch06.html ibus-1.3.8/docs/reference/ibus/html/ch06.html --- ibus-1.3.7/docs/reference/ibus/html/ch06.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ch06.html 2010-10-22 06:16:35.000000000 +0000 @@ -21,7 +21,7 @@

-Internal

+Internal
ibusdebug — Debug message output. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusAttribute.html ibus-1.3.8/docs/reference/ibus/html/IBusAttribute.html --- ibus-1.3.7/docs/reference/ibus/html/IBusAttribute.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusAttribute.html 2010-10-22 06:16:35.000000000 +0000 @@ -47,26 +47,26 @@ enum IBusAttrUnderline; IBusAttribute; IBusAttributeClass; -IBusAttribute * ibus_attribute_new (guint type, - guint value, - guint start_index, - guint end_index); -IBusAttribute * ibus_attr_underline_new (guint underline_type, - guint start_index, - guint end_index); -IBusAttribute * ibus_attr_foreground_new (guint color, - guint start_index, - guint end_index); -IBusAttribute * ibus_attr_background_new (guint color, - guint start_index, - guint end_index); +IBusAttribute * ibus_attribute_new (guint type, + guint value, + guint start_index, + guint end_index); +IBusAttribute * ibus_attr_underline_new (guint underline_type, + guint start_index, + guint end_index); +IBusAttribute * ibus_attr_foreground_new (guint color, + guint start_index, + guint end_index); +IBusAttribute * ibus_attr_background_new (guint color, + guint start_index, + guint end_index);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusAttribute
@@ -176,22 +176,22 @@
 
 
 
-

guint type;

+

guint type;

IBusAttributeType -

guint value;

+

guint value;

Value for the type. -

guint start_index;

+

guint start_index;

The starting index, inclusive. -

guint end_index;

+

guint end_index;

The ending index, exclusive. @@ -211,10 +211,10 @@

ibus_attribute_new ()

-
IBusAttribute *     ibus_attribute_new                  (guint type,
-                                                         guint value,
-                                                         guint start_index,
-                                                         guint end_index);
+
IBusAttribute *     ibus_attribute_new                  (guint type,
+                                                         guint value,
+                                                         guint start_index,
+                                                         guint end_index);

New an IBusAttribute.

@@ -252,9 +252,9 @@

ibus_attr_underline_new ()

-
IBusAttribute *     ibus_attr_underline_new             (guint underline_type,
-                                                         guint start_index,
-                                                         guint end_index);
+
IBusAttribute *     ibus_attr_underline_new             (guint underline_type,
+                                                         guint start_index,
+                                                         guint end_index);

New an underline IBusAttribute.

@@ -287,9 +287,9 @@

ibus_attr_foreground_new ()

-
IBusAttribute *     ibus_attr_foreground_new            (guint color,
-                                                         guint start_index,
-                                                         guint end_index);
+
IBusAttribute *     ibus_attr_foreground_new            (guint color,
+                                                         guint start_index,
+                                                         guint end_index);

New an foreground IBusAttribute.

@@ -322,9 +322,9 @@

ibus_attr_background_new ()

-
IBusAttribute *     ibus_attr_background_new            (guint color,
-                                                         guint start_index,
-                                                         guint end_index);
+
IBusAttribute *     ibus_attr_background_new            (guint color,
+                                                         guint start_index,
+                                                         guint end_index);

New an background IBusAttribute.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusAttrList.html ibus-1.3.8/docs/reference/ibus/html/IBusAttrList.html --- ibus-1.3.7/docs/reference/ibus/html/IBusAttrList.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusAttrList.html 2010-10-22 06:16:35.000000000 +0000 @@ -49,14 +49,14 @@ void ibus_attr_list_append (IBusAttrList *attr_list, IBusAttribute *attr); IBusAttribute * ibus_attr_list_get (IBusAttrList *attr_list, - guint index); + guint index);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusAttrList
@@ -79,7 +79,7 @@
 
- + @@ -139,7 +139,7 @@

ibus_attr_list_get ()

IBusAttribute *     ibus_attr_list_get                  (IBusAttrList *attr_list,
-                                                         guint index);
+ guint index);

Returns IBusAttribute at given index. Borrowed reference.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusBus.html ibus-1.3.8/docs/reference/ibus/html/IBusBus.html --- ibus-1.3.7/docs/reference/ibus/html/IBusBus.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusBus.html 2010-10-22 06:16:35.000000000 +0000 @@ -48,42 +48,42 @@
                    IBusBus;
                     IBusBusClass;
 IBusBus *           ibus_bus_new                        (void);
-gboolean            ibus_bus_is_connected               (IBusBus *bus);
-const gchar *       ibus_bus_hello                      (IBusBus *bus);
-guint               ibus_bus_request_name               (IBusBus *bus,
-                                                         const gchar *name,
-                                                         guint flags);
-guint               ibus_bus_release_name               (IBusBus *bus,
-                                                         const gchar *name);
-gboolean            ibus_bus_name_has_owner             (IBusBus *bus,
-                                                         const gchar *name);
-GList *             ibus_bus_list_names                 (IBusBus *bus);
+gboolean            ibus_bus_is_connected               (IBusBus *bus);
+const gchar *       ibus_bus_hello                      (IBusBus *bus);
+guint               ibus_bus_request_name               (IBusBus *bus,
+                                                         const gchar *name,
+                                                         guint flags);
+guint               ibus_bus_release_name               (IBusBus *bus,
+                                                         const gchar *name);
+gboolean            ibus_bus_name_has_owner             (IBusBus *bus,
+                                                         const gchar *name);
+GList *             ibus_bus_list_names                 (IBusBus *bus);
 void                ibus_bus_add_match                  (IBusBus *bus,
-                                                         const gchar *rule);
+                                                         const gchar *rule);
 void                ibus_bus_remove_match               (IBusBus *bus,
-                                                         const gchar *rule);
-gchar *             ibus_bus_get_name_owner             (IBusBus *bus,
-                                                         const gchar *name);
-gboolean            ibus_bus_exit                       (IBusBus *bus,
-                                                         gboolean restart);
-gchar *             ibus_bus_current_input_context      (IBusBus *bus);
-gboolean            ibus_bus_register_component         (IBusBus *bus,
+                                                         const gchar *rule);
+gchar *             ibus_bus_get_name_owner             (IBusBus *bus,
+                                                         const gchar *name);
+gboolean            ibus_bus_exit                       (IBusBus *bus,
+                                                         gboolean restart);
+gchar *             ibus_bus_current_input_context      (IBusBus *bus);
+gboolean            ibus_bus_register_component         (IBusBus *bus,
                                                          IBusComponent *component);
-GList *             ibus_bus_list_engines               (IBusBus *bus);
-GList *             ibus_bus_list_active_engines        (IBusBus *bus);
-gboolean            ibus_bus_get_use_sys_layout         (IBusBus *bus);
-gboolean            ibus_bus_get_use_global_engine      (IBusBus *bus);
-gboolean            ibus_bus_is_global_engine_enabled   (IBusBus *bus);
-gboolean            ibus_bus_set_global_engine          (IBusBus *bus,
-                                                         const gchar *global_engine);
+GList *             ibus_bus_list_engines               (IBusBus *bus);
+GList *             ibus_bus_list_active_engines        (IBusBus *bus);
+gboolean            ibus_bus_get_use_sys_layout         (IBusBus *bus);
+gboolean            ibus_bus_get_use_global_engine      (IBusBus *bus);
+gboolean            ibus_bus_is_global_engine_enabled   (IBusBus *bus);
+gboolean            ibus_bus_set_global_engine          (IBusBus *bus,
+                                                         const gchar *global_engine);
 IBusConfig *        ibus_bus_get_config                 (IBusBus *bus);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusBus
 
@@ -141,7 +141,7 @@

ibus_bus_is_connected ()

-
gboolean            ibus_bus_is_connected               (IBusBus *bus);
+
gboolean            ibus_bus_is_connected               (IBusBus *bus);

Return TRUE if bus is connected to IBus daemon.

@@ -164,7 +164,7 @@

ibus_bus_hello ()

-
const gchar *       ibus_bus_hello                      (IBusBus *bus);
+
const gchar *       ibus_bus_hello                      (IBusBus *bus);

This function sends a "HELLO" message to DBus daemon, which replies the unique name of current IBus process. @@ -188,9 +188,9 @@


ibus_bus_request_name ()

-
guint               ibus_bus_request_name               (IBusBus *bus,
-                                                         const gchar *name,
-                                                         guint flags);
+
guint               ibus_bus_request_name               (IBusBus *bus,
+                                                         const gchar *name,
+                                                         guint flags);

Request a name from IBus daemon.

@@ -223,8 +223,8 @@

ibus_bus_release_name ()

-
guint               ibus_bus_release_name               (IBusBus *bus,
-                                                         const gchar *name);
+
guint               ibus_bus_release_name               (IBusBus *bus,
+                                                         const gchar *name);

Release a name to IBus daemon.

@@ -252,8 +252,8 @@

ibus_bus_name_has_owner ()

-
gboolean            ibus_bus_name_has_owner             (IBusBus *bus,
-                                                         const gchar *name);
+
gboolean            ibus_bus_name_has_owner             (IBusBus *bus,
+                                                         const gchar *name);

Whether the name has owner.

@@ -281,7 +281,7 @@

ibus_bus_list_names ()

-
GList *             ibus_bus_list_names                 (IBusBus *bus);
+
GList *             ibus_bus_list_names                 (IBusBus *bus);

Return lists that attached to bus.

@@ -311,7 +311,7 @@

ibus_bus_add_match ()

void                ibus_bus_add_match                  (IBusBus *bus,
-                                                         const gchar *rule);
+ const gchar *rule);

Add a match rule to an IBusBus.

@@ -335,7 +335,7 @@

ibus_bus_remove_match ()

void                ibus_bus_remove_match               (IBusBus *bus,
-                                                         const gchar *rule);
+ const gchar *rule);

Remove a match rule to an IBusBus.

@@ -358,8 +358,8 @@

ibus_bus_get_name_owner ()

-
gchar *             ibus_bus_get_name_owner             (IBusBus *bus,
-                                                         const gchar *name);
+
gchar *             ibus_bus_get_name_owner             (IBusBus *bus,
+                                                         const gchar *name);

Return the name owner.

@@ -378,7 +378,7 @@
- @@ -387,8 +387,8 @@

ibus_bus_exit ()

-
gboolean            ibus_bus_exit                       (IBusBus *bus,
-                                                         gboolean restart);
+
gboolean            ibus_bus_exit                       (IBusBus *bus,
+                                                         gboolean restart);

Exit or restart an IBusBus.

@@ -416,7 +416,7 @@

ibus_bus_current_input_context ()

-
gchar *             ibus_bus_current_input_context      (IBusBus *bus);
+
gchar *             ibus_bus_current_input_context      (IBusBus *bus);

Get the current focused input context.

@@ -432,7 +432,7 @@
@@ -441,7 +441,7 @@

ibus_bus_register_component ()

-
gboolean            ibus_bus_register_component         (IBusBus *bus,
+
gboolean            ibus_bus_register_component         (IBusBus *bus,
                                                          IBusComponent *component);

Register a componet to an IBusBus. @@ -470,7 +470,7 @@


ibus_bus_list_engines ()

-
GList *             ibus_bus_list_engines               (IBusBus *bus);
+
GList *             ibus_bus_list_engines               (IBusBus *bus);

List engines. Note that this function is not yet implemented. @@ -494,7 +494,7 @@


ibus_bus_list_active_engines ()

-
GList *             ibus_bus_list_active_engines        (IBusBus *bus);
+
GList *             ibus_bus_list_active_engines        (IBusBus *bus);

List active engines. Note that this function is not yet implemented. @@ -524,7 +524,7 @@


ibus_bus_get_use_sys_layout ()

-
gboolean            ibus_bus_get_use_sys_layout         (IBusBus *bus);
+
gboolean            ibus_bus_get_use_sys_layout         (IBusBus *bus);

Check if the bus's "use_sys_layout" option is enabled or not.

@@ -547,7 +547,7 @@

ibus_bus_get_use_global_engine ()

-
gboolean            ibus_bus_get_use_global_engine      (IBusBus *bus);
+
gboolean            ibus_bus_get_use_global_engine      (IBusBus *bus);

Check if the bus's "use_global_engine" option is enabled or not.

@@ -570,7 +570,7 @@

ibus_bus_is_global_engine_enabled ()

-
gboolean            ibus_bus_is_global_engine_enabled   (IBusBus *bus);
+
gboolean            ibus_bus_is_global_engine_enabled   (IBusBus *bus);

Check if the current global engine is enabled or not.

@@ -593,8 +593,8 @@

ibus_bus_set_global_engine ()

-
gboolean            ibus_bus_set_global_engine          (IBusBus *bus,
-                                                         const gchar *global_engine);
+
gboolean            ibus_bus_set_global_engine          (IBusBus *bus,
+                                                         const gchar *global_engine);

Set current global engine.

@@ -648,7 +648,7 @@

The "connected" signal

void                user_function                      (IBusBus *arg0,
-                                                        gpointer user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when IBusBus is connected.

@@ -672,7 +672,7 @@

The "disconnected" signal

void                user_function                      (IBusBus *arg0,
-                                                        gpointer user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when IBusBus is disconnected.

@@ -696,7 +696,7 @@

The "global-engine-changed" signal

void                user_function                      (IBusBus *arg0,
-                                                        gpointer user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when global engine is changed.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusComponent.html ibus-1.3.8/docs/reference/ibus/html/IBusComponent.html --- ibus-1.3.7/docs/reference/ibus/html/IBusComponent.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusComponent.html 2010-10-22 06:16:35.000000000 +0000 @@ -45,43 +45,43 @@

Synopsis

                    IBusComponent;
                     IBusComponentClass;
-IBusComponent *     ibus_component_new                  (const gchar *name,
-                                                         const gchar *description,
-                                                         const gchar *version,
-                                                         const gchar *license,
-                                                         const gchar *author,
-                                                         const gchar *homepage,
-                                                         const gchar *exec,
-                                                         const gchar *textdomain);
+IBusComponent *     ibus_component_new                  (const gchar *name,
+                                                         const gchar *description,
+                                                         const gchar *version,
+                                                         const gchar *license,
+                                                         const gchar *author,
+                                                         const gchar *homepage,
+                                                         const gchar *exec,
+                                                         const gchar *textdomain);
 IBusComponent *     ibus_component_new_from_xml_node    (XMLNode *node);
-IBusComponent *     ibus_component_new_from_file        (const gchar *filename);
+IBusComponent *     ibus_component_new_from_file        (const gchar *filename);
 void                ibus_component_add_observed_path    (IBusComponent *component,
-                                                         const gchar *path,
-                                                         gboolean access_fs);
+                                                         const gchar *path,
+                                                         gboolean access_fs);
 void                ibus_component_add_engine           (IBusComponent *component,
                                                          IBusEngineDesc *engine);
-GList *             ibus_component_get_engines          (IBusComponent *component);
+GList *             ibus_component_get_engines          (IBusComponent *component);
 void                ibus_component_output               (IBusComponent *component,
-                                                         GString *output,
-                                                         gint indent);
+                                                         GString *output,
+                                                         gint indent);
 void                ibus_component_output_engines       (IBusComponent *component,
-                                                         GString *output,
-                                                         gint indent);
-gboolean            ibus_component_check_modification   (IBusComponent *component);
-gboolean            ibus_component_start                (IBusComponent *component,
-                                                         gboolean verbose);
-gboolean            ibus_component_stop                 (IBusComponent *component);
-gboolean            ibus_component_is_running           (IBusComponent *component);
+                                                         GString *output,
+                                                         gint indent);
+gboolean            ibus_component_check_modification   (IBusComponent *component);
+gboolean            ibus_component_start                (IBusComponent *component,
+                                                         gboolean verbose);
+gboolean            ibus_component_stop                 (IBusComponent *component);
+gboolean            ibus_component_is_running           (IBusComponent *component);
 IBusComponent *     ibus_component_get_from_engine      (IBusEngineDesc *engine);
 void                ibus_component_set_restart          (IBusComponent *component,
-                                                         gboolean restart);
+                                                         gboolean restart);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusComponent
@@ -128,42 +128,42 @@
 
- + - + - + - + - + - + - + - + @@ -185,14 +185,14 @@

ibus_component_new ()

-
IBusComponent *     ibus_component_new                  (const gchar *name,
-                                                         const gchar *description,
-                                                         const gchar *version,
-                                                         const gchar *license,
-                                                         const gchar *author,
-                                                         const gchar *homepage,
-                                                         const gchar *exec,
-                                                         const gchar *textdomain);
+
IBusComponent *     ibus_component_new                  (const gchar *name,
+                                                         const gchar *description,
+                                                         const gchar *version,
+                                                         const gchar *license,
+                                                         const gchar *author,
+                                                         const gchar *homepage,
+                                                         const gchar *exec,
+                                                         const gchar *textdomain);

New an IBusComponent.

@@ -273,7 +273,7 @@

ibus_component_new_from_file ()

-
IBusComponent *     ibus_component_new_from_file        (const gchar *filename);
+
IBusComponent *     ibus_component_new_from_file        (const gchar *filename);

New an IBusComponent from an XML file. Note that a component file usually contains engine descriptions, @@ -300,8 +300,8 @@

ibus_component_add_observed_path ()

void                ibus_component_add_observed_path    (IBusComponent *component,
-                                                         const gchar *path,
-                                                         gboolean access_fs);
+ const gchar *path, + gboolean access_fs);

Add an observed path to IBusComponent.

@@ -353,7 +353,7 @@

ibus_component_get_engines ()

-
GList *             ibus_component_get_engines          (IBusComponent *component);
+
GList *             ibus_component_get_engines          (IBusComponent *component);

Get the engines of this component.

@@ -377,8 +377,8 @@

ibus_component_output ()

void                ibus_component_output               (IBusComponent *component,
-                                                         GString *output,
-                                                         gint indent);
+ GString *output, + gint indent);

Output IBusComponent as an XML-formatted string. The output string can be then shown on the screen or written to file. @@ -408,8 +408,8 @@

ibus_component_output_engines ()

void                ibus_component_output_engines       (IBusComponent *component,
-                                                         GString *output,
-                                                         gint indent);
+ GString *output, + gint indent);

Output engine description as an XML-formatted string. The output string can be then shown on the screen or written to file. @@ -438,7 +438,7 @@


ibus_component_check_modification ()

-
gboolean            ibus_component_check_modification   (IBusComponent *component);
+
gboolean            ibus_component_check_modification   (IBusComponent *component);

Check whether the observed paths of component is modified.

@@ -461,8 +461,8 @@

ibus_component_start ()

-
gboolean            ibus_component_start                (IBusComponent *component,
-                                                         gboolean verbose);
+
gboolean            ibus_component_start                (IBusComponent *component,
+                                                         gboolean verbose);

Whether the IBusComponent is started.

@@ -490,7 +490,7 @@

ibus_component_stop ()

-
gboolean            ibus_component_stop                 (IBusComponent *component);
+
gboolean            ibus_component_stop                 (IBusComponent *component);

Whether the IBusComponent is stopped.

@@ -513,7 +513,7 @@

ibus_component_is_running ()

-
gboolean            ibus_component_is_running           (IBusComponent *component);
+
gboolean            ibus_component_is_running           (IBusComponent *component);

Whether the IBusComponent is running.

@@ -560,7 +560,7 @@

ibus_component_set_restart ()

void                ibus_component_set_restart          (IBusComponent *component,
-                                                         gboolean restart);
+ gboolean restart);

Set whether the component needs to be restarted when it dies.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusConfig.html ibus-1.3.8/docs/reference/ibus/html/IBusConfig.html --- ibus-1.3.7/docs/reference/ibus/html/IBusConfig.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusConfig.html 2010-10-22 06:16:35.000000000 +0000 @@ -44,24 +44,24 @@
                    IBusConfig;
                     IBusConfigClass;
 IBusConfig *        ibus_config_new                     (IBusConnection *connection);
-gboolean            ibus_config_get_value               (IBusConfig *config,
-                                                         const gchar *section,
-                                                         const gchar *name,
-                                                         GValue *value);
-gboolean            ibus_config_set_value               (IBusConfig *config,
-                                                         const gchar *section,
-                                                         const gchar *name,
-                                                         const GValue *value);
-gboolean            ibus_config_unset                   (IBusConfig *config,
-                                                         const gchar *section,
-                                                         const gchar *name);
+gboolean            ibus_config_get_value               (IBusConfig *config,
+                                                         const gchar *section,
+                                                         const gchar *name,
+                                                         GValue *value);
+gboolean            ibus_config_set_value               (IBusConfig *config,
+                                                         const gchar *section,
+                                                         const gchar *name,
+                                                         const GValue *value);
+gboolean            ibus_config_unset                   (IBusConfig *config,
+                                                         const gchar *section,
+                                                         const gchar *name);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusProxy
                      +----IBusConfig
@@ -129,10 +129,10 @@
 

ibus_config_get_value ()

-
gboolean            ibus_config_get_value               (IBusConfig *config,
-                                                         const gchar *section,
-                                                         const gchar *name,
-                                                         GValue *value);
+
gboolean            ibus_config_get_value               (IBusConfig *config,
+                                                         const gchar *section,
+                                                         const gchar *name,
+                                                         GValue *value);

Get the value of a configuration option.

@@ -181,10 +181,10 @@

ibus_config_set_value ()

-
gboolean            ibus_config_set_value               (IBusConfig *config,
-                                                         const gchar *section,
-                                                         const gchar *name,
-                                                         const GValue *value);
+
gboolean            ibus_config_set_value               (IBusConfig *config,
+                                                         const gchar *section,
+                                                         const gchar *name,
+                                                         const GValue *value);

Set the value of a configuration option. see_also: ibus_config_get_value. @@ -223,9 +223,9 @@


ibus_config_unset ()

-
gboolean            ibus_config_unset                   (IBusConfig *config,
-                                                         const gchar *section,
-                                                         const gchar *name);
+
gboolean            ibus_config_unset                   (IBusConfig *config,
+                                                         const gchar *section,
+                                                         const gchar *name);

Remove an entry of a configuration option. see_also: ibus_config_get_value. @@ -262,10 +262,10 @@

The "value-changed" signal

void                user_function                      (IBusConfig *config,
-                                                        gchar      *section,
-                                                        gchar      *name,
-                                                        GValue     *value,
-                                                        gpointer    user_data)      : Run Last
+ gchar *section, + gchar *name, + GValue *value, + gpointer user_data) : Run Last

Emitted when configuration value is changed.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusConfigService.html ibus-1.3.8/docs/reference/ibus/html/IBusConfigService.html --- ibus-1.3.7/docs/reference/ibus/html/IBusConfigService.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusConfigService.html 2010-10-22 06:16:35.000000000 +0000 @@ -49,16 +49,16 @@ IBusConfigServiceClass; IBusConfigService * ibus_config_service_new (IBusConnection *connection); void ibus_config_service_value_changed (IBusConfigService *config, - const gchar *section, - const gchar *name, - const GValue *value); + const gchar *section, + const gchar *name, + const GValue *value);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusService
                      +----IBusConfigService
@@ -250,9 +250,9 @@
 

ibus_config_service_value_changed ()

void                ibus_config_service_value_changed   (IBusConfigService *config,
-                                                         const gchar *section,
-                                                         const gchar *name,
-                                                         const GValue *value);
+ const gchar *section, + const gchar *name, + const GValue *value);

Change a value of a configuration option by sending a "ValueChanged" message to IBus service. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusConnection.html ibus-1.3.8/docs/reference/ibus/html/IBusConnection.html --- ibus-1.3.7/docs/reference/ibus/html/IBusConnection.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusConnection.html 2010-10-22 06:16:35.000000000 +0000 @@ -48,88 +48,88 @@

Synopsis

                    IBusConnection;
                     IBusConnectionClass;
-gboolean            (*IBusIBusMessageFunc)              (IBusConnection *connection,
+gboolean            (*IBusIBusMessageFunc)              (IBusConnection *connection,
                                                          IBusMessage *message);
-gboolean            (*IBusIBusSignalFunc)               (IBusConnection *connection,
+gboolean            (*IBusIBusSignalFunc)               (IBusConnection *connection,
                                                          IBusMessage *message);
-gboolean            (*IBusMessageFunc)                  (IBusConnection *connection,
+gboolean            (*IBusMessageFunc)                  (IBusConnection *connection,
                                                          IBusMessage *message,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 IBusConnection *    ibus_connection_new                 (void);
 void                ibus_connection_set_connection      (IBusConnection *connection,
                                                          DBusConnection *dbus_connection,
-                                                         gboolean shared);
-IBusConnection *    ibus_connection_open                (const gchar *address);
-IBusConnection *    ibus_connection_open_private        (const gchar *address);
+                                                         gboolean shared);
+IBusConnection *    ibus_connection_open                (const gchar *address);
+IBusConnection *    ibus_connection_open_private        (const gchar *address);
 void                ibus_connection_close               (IBusConnection *connection);
-gboolean            ibus_connection_is_connected        (IBusConnection *connection);
-gboolean            ibus_connection_is_authenticated    (IBusConnection *connection);
+gboolean            ibus_connection_is_connected        (IBusConnection *connection);
+gboolean            ibus_connection_is_authenticated    (IBusConnection *connection);
 DBusConnection *    ibus_connection_get_connection      (IBusConnection *connection);
-glong               ibus_connection_get_unix_user       (IBusConnection *connection);
-gboolean            ibus_connection_read_write_dispatch (IBusConnection *connection,
-                                                         gint timeout);
-gboolean            ibus_connection_send                (IBusConnection *connection,
+glong               ibus_connection_get_unix_user       (IBusConnection *connection);
+gboolean            ibus_connection_read_write_dispatch (IBusConnection *connection,
+                                                         gint timeout);
+gboolean            ibus_connection_send                (IBusConnection *connection,
                                                          IBusMessage *message);
-gboolean            ibus_connection_send_signal         (IBusConnection *connection,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *name,
-                                                         GType first_arg_type,
+gboolean            ibus_connection_send_signal         (IBusConnection *connection,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *name,
+                                                         GType first_arg_type,
                                                          ...);
-gboolean            ibus_connection_send_signal_valist  (IBusConnection *connection,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *name,
-                                                         GType first_arg_type,
+gboolean            ibus_connection_send_signal_valist  (IBusConnection *connection,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *name,
+                                                         GType first_arg_type,
                                                          va_list args);
-gboolean            ibus_connection_send_valist         (IBusConnection *connection,
-                                                         gint message_type,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *name,
-                                                         GType first_arg_type,
+gboolean            ibus_connection_send_valist         (IBusConnection *connection,
+                                                         gint message_type,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *name,
+                                                         GType first_arg_type,
                                                          va_list args);
-gboolean            ibus_connection_send_with_reply     (IBusConnection *connection,
+gboolean            ibus_connection_send_with_reply     (IBusConnection *connection,
                                                          IBusMessage *message,
                                                          IBusPendingCall **pending_return,
-                                                         gint timeout_milliseconds);
+                                                         gint timeout_milliseconds);
 IBusMessage *       ibus_connection_send_with_reply_and_block
                                                         (IBusConnection *connection,
                                                          IBusMessage *message,
-                                                         gint timeout_milliseconds,
+                                                         gint timeout_milliseconds,
                                                          IBusError **error);
-gboolean            ibus_connection_call                (IBusConnection *connection,
-                                                         const gchar *name,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *member,
+gboolean            ibus_connection_call                (IBusConnection *connection,
+                                                         const gchar *name,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *member,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);
 IBusMessage *       ibus_connection_call_with_reply     (IBusConnection *connection,
-                                                         const gchar *name,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *member,
+                                                         const gchar *name,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *member,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);
 void                ibus_connection_flush               (IBusConnection *connection);
-gboolean            ibus_connection_register_object_path
+gboolean            ibus_connection_register_object_path
                                                         (IBusConnection *connection,
-                                                         const gchar *path,
+                                                         const gchar *path,
                                                          IBusMessageFunc message_func,
-                                                         gpointer user_data);
-gboolean            ibus_connection_unregister_object_path
+                                                         gpointer user_data);
+gboolean            ibus_connection_unregister_object_path
                                                         (IBusConnection *connection,
-                                                         const gchar *path);
+                                                         const gchar *path);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusConnection
 
@@ -190,7 +190,7 @@

IBusIBusMessageFunc ()

-
gboolean            (*IBusIBusMessageFunc)              (IBusConnection *connection,
+
gboolean            (*IBusIBusMessageFunc)              (IBusConnection *connection,
                                                          IBusMessage *message);

Prototype of an IBusIBusMessage callback function. @@ -219,7 +219,7 @@


IBusIBusSignalFunc ()

-
gboolean            (*IBusIBusSignalFunc)               (IBusConnection *connection,
+
gboolean            (*IBusIBusSignalFunc)               (IBusConnection *connection,
                                                          IBusMessage *message);

Prototype of an IBusIBusSignal callback function. @@ -248,9 +248,9 @@


IBusMessageFunc ()

-
gboolean            (*IBusMessageFunc)                  (IBusConnection *connection,
+
gboolean            (*IBusMessageFunc)                  (IBusConnection *connection,
                                                          IBusMessage *message,
-                                                         gpointer user_data);
+ gpointer user_data);

Prototype of an IBusMessage callback function.

@@ -301,7 +301,7 @@

ibus_connection_set_connection ()

void                ibus_connection_set_connection      (IBusConnection *connection,
                                                          DBusConnection *dbus_connection,
-                                                         gboolean shared);
+ gboolean shared);

Set an IBusConnection as data of a D-Bus connection. Emit signal ibus-message when receiving incoming message from dbus_connection. @@ -330,7 +330,7 @@


ibus_connection_open ()

-
IBusConnection *    ibus_connection_open                (const gchar *address);
+
IBusConnection *    ibus_connection_open                (const gchar *address);

Open an IBusConnection that is set to a D-Bus connection to the specified address. Use ibus_connection_open_private() to get a dedicated connection not shared with other callers of @@ -358,7 +358,7 @@


ibus_connection_open_private ()

-
IBusConnection *    ibus_connection_open_private        (const gchar *address);
+
IBusConnection *    ibus_connection_open_private        (const gchar *address);

Open an IBusConnection that is set to a D-Bus connection to the specified address. Unlike ibus_connection_open(), this function always creates a new D-Bus connection. @@ -406,7 +406,7 @@


ibus_connection_is_connected ()

-
gboolean            ibus_connection_is_connected        (IBusConnection *connection);
+
gboolean            ibus_connection_is_connected        (IBusConnection *connection);

Whether an IBusConnection is connected.

@@ -429,7 +429,7 @@

ibus_connection_is_authenticated ()

-
gboolean            ibus_connection_is_authenticated    (IBusConnection *connection);
+
gboolean            ibus_connection_is_authenticated    (IBusConnection *connection);

Whether an IBusConnection is authenticated.

@@ -475,7 +475,7 @@

ibus_connection_get_unix_user ()

-
glong               ibus_connection_get_unix_user       (IBusConnection *connection);
+
glong               ibus_connection_get_unix_user       (IBusConnection *connection);

Return The UNIX UID of peer user.

@@ -498,8 +498,8 @@

ibus_connection_read_write_dispatch ()

-
gboolean            ibus_connection_read_write_dispatch (IBusConnection *connection,
-                                                         gint timeout);
+
gboolean            ibus_connection_read_write_dispatch (IBusConnection *connection,
+                                                         gint timeout);

Return TRUE if the disconnect message has not been processed. This function is a wrapper of dbus_connection_read_write_dispatch(), @@ -554,7 +554,7 @@


ibus_connection_send ()

-
gboolean            ibus_connection_send                (IBusConnection *connection,
+
gboolean            ibus_connection_send                (IBusConnection *connection,
                                                          IBusMessage *message);

Send an IBusMessage to an IBusConnection. @@ -589,11 +589,11 @@


ibus_connection_send_signal ()

-
gboolean            ibus_connection_send_signal         (IBusConnection *connection,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *name,
-                                                         GType first_arg_type,
+
gboolean            ibus_connection_send_signal         (IBusConnection *connection,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *name,
+                                                         GType first_arg_type,
                                                          ...);

Send a wrapped D-Bus signal to an IBusConnection. @@ -647,11 +647,11 @@


ibus_connection_send_signal_valist ()

-
gboolean            ibus_connection_send_signal_valist  (IBusConnection *connection,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *name,
-                                                         GType first_arg_type,
+
gboolean            ibus_connection_send_signal_valist  (IBusConnection *connection,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *name,
+                                                         GType first_arg_type,
                                                          va_list args);

Send a wrapped D-Bus signal to an IBusConnection. @@ -706,12 +706,12 @@


ibus_connection_send_valist ()

-
gboolean            ibus_connection_send_valist         (IBusConnection *connection,
-                                                         gint message_type,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *name,
-                                                         GType first_arg_type,
+
gboolean            ibus_connection_send_valist         (IBusConnection *connection,
+                                                         gint message_type,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *name,
+                                                         GType first_arg_type,
                                                          va_list args);

Send a wrapped D-Bus message to an IBusConnection. @@ -784,10 +784,10 @@


ibus_connection_send_with_reply ()

-
gboolean            ibus_connection_send_with_reply     (IBusConnection *connection,
+
gboolean            ibus_connection_send_with_reply     (IBusConnection *connection,
                                                          IBusMessage *message,
                                                          IBusPendingCall **pending_return,
-                                                         gint timeout_milliseconds);
+ gint timeout_milliseconds);

Queues an IBusMessage to send, and returns a IBusPendingCall used to receive a reply to the message. This function is a wrapper of dbus_connection_send_with_reply(). @@ -834,7 +834,7 @@

IBusMessage *       ibus_connection_send_with_reply_and_block
                                                         (IBusConnection *connection,
                                                          IBusMessage *message,
-                                                         gint timeout_milliseconds,
+                                                         gint timeout_milliseconds,
                                                          IBusError **error);

Sends an IBus message and blocks a certain time period while waiting for @@ -879,13 +879,13 @@


ibus_connection_call ()

-
gboolean            ibus_connection_call                (IBusConnection *connection,
-                                                         const gchar *name,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *member,
+
gboolean            ibus_connection_call                (IBusConnection *connection,
+                                                         const gchar *name,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *member,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);

Invoke a member function by sending an IBusMessage. This method does not @@ -949,12 +949,12 @@

ibus_connection_call_with_reply ()

IBusMessage *       ibus_connection_call_with_reply     (IBusConnection *connection,
-                                                         const gchar *name,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *member,
+                                                         const gchar *name,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *member,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);

Invoke a member function by sending an IBusMessage. @@ -1037,11 +1037,11 @@


ibus_connection_register_object_path ()

-
gboolean            ibus_connection_register_object_path
+
gboolean            ibus_connection_register_object_path
                                                         (IBusConnection *connection,
-                                                         const gchar *path,
+                                                         const gchar *path,
                                                          IBusMessageFunc message_func,
-                                                         gpointer user_data);
+ gpointer user_data);

Registers a handler for a given path in the object hierarchy. The given vtable handles messages sent to exactly the given path. @@ -1084,9 +1084,9 @@


ibus_connection_unregister_object_path ()

-
gboolean            ibus_connection_unregister_object_path
+
gboolean            ibus_connection_unregister_object_path
                                                         (IBusConnection *connection,
-                                                         const gchar *path);
+ const gchar *path);

Unregisters the handler registered with exactly the given path. It's a bug to call this function for a path that isn't registered. @@ -1119,9 +1119,9 @@

Signal Details

The "authenticate-unix-user" signal

-
gboolean            user_function                      (IBusConnection *ibusconnection,
-                                                        gulong          uid,
-                                                        gpointer        user_data)           : Run Last
+
gboolean            user_function                      (IBusConnection *ibusconnection,
+                                                        gulong          uid,
+                                                        gpointer        user_data)           : Run Last

Emitted when sending an ibus-message. Implement the member function ibus_message() in extended class to receive this signal. @@ -1163,7 +1163,7 @@

The "disconnected" signal

void                user_function                      (IBusConnection *ibusconnection,
-                                                        gpointer        user_data)           : Run Last
+ gpointer user_data) : Run Last

Emitted when an ibus-message is disconnected. Implement the member function disconnected() function in extended class to receive this signal. @@ -1194,9 +1194,9 @@


The "ibus-message" signal

-
gboolean            user_function                      (IBusConnection *ibusconnection,
-                                                        gpointer        message,
-                                                        gpointer        user_data)           : Run Last
+
gboolean            user_function                      (IBusConnection *ibusconnection,
+                                                        gpointer        message,
+                                                        gpointer        user_data)           : Run Last

Emitted when sending an ibus-message. Implement the member function ibus_message() in extended class to receive this signal. @@ -1238,8 +1238,8 @@

The "ibus-message-sent" signal

void                user_function                      (IBusConnection *ibusconnection,
-                                                        gpointer        message,
-                                                        gpointer        user_data)           : Run Last
+ gpointer message, + gpointer user_data) : Run Last

Emitted when an ibus-message is sent. Implement the member function ibus_message_sent() function in extended class to receive this signal. @@ -1275,9 +1275,9 @@


The "ibus-signal" signal

-
gboolean            user_function                      (IBusConnection *ibusconnection,
-                                                        gpointer        message,
-                                                        gpointer        user_data)           : Run Last
+
gboolean            user_function                      (IBusConnection *ibusconnection,
+                                                        gpointer        message,
+                                                        gpointer        user_data)           : Run Last

Emitted when sending an ibus-signal. Implement the member function ibus_signal() function in extended class to receive this signal. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusEngineDesc.html ibus-1.3.8/docs/reference/ibus/html/IBusEngineDesc.html --- ibus-1.3.7/docs/reference/ibus/html/IBusEngineDesc.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusEngineDesc.html 2010-10-22 06:16:35.000000000 +0000 @@ -46,25 +46,25 @@

                    IBusEngineDesc;
                     IBusEngineDescClass;
                     BusComponent;
-IBusEngineDesc *    ibus_engine_desc_new                (const gchar *name,
-                                                         const gchar *longname,
-                                                         const gchar *description,
-                                                         const gchar *language,
-                                                         const gchar *license,
-                                                         const gchar *author,
-                                                         const gchar *icon,
-                                                         const gchar *layout);
+IBusEngineDesc *    ibus_engine_desc_new                (const gchar *name,
+                                                         const gchar *longname,
+                                                         const gchar *description,
+                                                         const gchar *language,
+                                                         const gchar *license,
+                                                         const gchar *author,
+                                                         const gchar *icon,
+                                                         const gchar *layout);
 IBusEngineDesc *    ibus_engine_desc_new_from_xml_node  (XMLNode *node);
 void                ibus_engine_desc_output             (IBusEngineDesc *info,
-                                                         GString *output,
-                                                         gint indent);
+                                                         GString *output,
+                                                         gint indent);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusEngineDesc
@@ -111,53 +111,53 @@
 
- + - + - + - + - + - + - + - + - + - + @@ -186,14 +186,14 @@

ibus_engine_desc_new ()

-
IBusEngineDesc *    ibus_engine_desc_new                (const gchar *name,
-                                                         const gchar *longname,
-                                                         const gchar *description,
-                                                         const gchar *language,
-                                                         const gchar *license,
-                                                         const gchar *author,
-                                                         const gchar *icon,
-                                                         const gchar *layout);
+
IBusEngineDesc *    ibus_engine_desc_new                (const gchar *name,
+                                                         const gchar *longname,
+                                                         const gchar *description,
+                                                         const gchar *language,
+                                                         const gchar *license,
+                                                         const gchar *author,
+                                                         const gchar *icon,
+                                                         const gchar *layout);

New a IBusEngineDesc.

@@ -284,8 +284,8 @@

ibus_engine_desc_output ()

void                ibus_engine_desc_output             (IBusEngineDesc *info,
-                                                         GString *output,
-                                                         gint indent);
+ GString *output, + gint indent);

Output XML-formatted input method engine description. The result will be append to GString specified in output. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusEngine.html ibus-1.3.8/docs/reference/ibus/html/IBusEngine.html --- ibus-1.3.7/docs/reference/ibus/html/IBusEngine.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusEngine.html 2010-10-22 06:16:35.000000000 +0000 @@ -49,56 +49,56 @@

Synopsis

                    IBusEngine;
                     IBusEngineClass;
-IBusEngine *        ibus_engine_new                     (const gchar *name,
-                                                         const gchar *path,
+IBusEngine *        ibus_engine_new                     (const gchar *name,
+                                                         const gchar *path,
                                                          IBusConnection *connection);
 void                ibus_engine_commit_text             (IBusEngine *engine,
                                                          IBusText *text);
 void                ibus_engine_update_preedit_text     (IBusEngine *engine,
                                                          IBusText *text,
-                                                         guint cursor_pos,
-                                                         gboolean visible);
+                                                         guint cursor_pos,
+                                                         gboolean visible);
 void                ibus_engine_update_preedit_text_with_mode
                                                         (IBusEngine *engine,
                                                          IBusText *text,
-                                                         guint cursor_pos,
-                                                         gboolean visible,
+                                                         guint cursor_pos,
+                                                         gboolean visible,
                                                          IBusPreeditFocusMode mode);
 void                ibus_engine_show_preedit_text       (IBusEngine *engine);
 void                ibus_engine_hide_preedit_text       (IBusEngine *engine);
 void                ibus_engine_update_auxiliary_text   (IBusEngine *engine,
                                                          IBusText *text,
-                                                         gboolean visible);
+                                                         gboolean visible);
 void                ibus_engine_show_auxiliary_text     (IBusEngine *engine);
 void                ibus_engine_hide_auxiliary_text     (IBusEngine *engine);
 void                ibus_engine_update_lookup_table     (IBusEngine *engine,
                                                          IBusLookupTable *lookup_table,
-                                                         gboolean visible);
+                                                         gboolean visible);
 void                ibus_engine_update_lookup_table_fast
                                                         (IBusEngine *engine,
                                                          IBusLookupTable *lookup_table,
-                                                         gboolean visible);
+                                                         gboolean visible);
 void                ibus_engine_show_lookup_table       (IBusEngine *engine);
 void                ibus_engine_hide_lookup_table       (IBusEngine *engine);
 void                ibus_engine_forward_key_event       (IBusEngine *engine,
-                                                         guint keyval,
-                                                         guint keycode,
-                                                         guint state);
+                                                         guint keyval,
+                                                         guint keycode,
+                                                         guint state);
 void                ibus_engine_register_properties     (IBusEngine *engine,
                                                          IBusPropList *prop_list);
 void                ibus_engine_update_property         (IBusEngine *engine,
                                                          IBusProperty *prop);
 void                ibus_engine_delete_surrounding_text (IBusEngine *engine,
-                                                         gint offset,
-                                                         guint nchars);
-const gchar *       ibus_engine_get_name                (IBusEngine *engine);
+                                                         gint offset,
+                                                         guint nchars);
+const gchar *       ibus_engine_get_name                (IBusEngine *engine);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusService
                      +----IBusEngine
@@ -108,7 +108,7 @@
 

Properties

   "connection"               IBusConnection*       : Read / Write / Construct Only
-  "name"                     gchar*                : Read / Write / Construct Only
+  "name"                     gchar*                : Read / Write / Construct Only
 
@@ -162,12 +162,12 @@
- + - + @@ -177,7 +177,7 @@ - + @@ -237,8 +237,8 @@

ibus_engine_new ()

-
IBusEngine *        ibus_engine_new                     (const gchar *name,
-                                                         const gchar *path,
+
IBusEngine *        ibus_engine_new                     (const gchar *name,
+                                                         const gchar *path,
                                                          IBusConnection *connection);

New an IBusEngine. @@ -303,8 +303,8 @@

ibus_engine_update_preedit_text ()

void                ibus_engine_update_preedit_text     (IBusEngine *engine,
                                                          IBusText *text,
-                                                         guint cursor_pos,
-                                                         gboolean visible);
+ guint cursor_pos, + gboolean visible);

Update the pre-edit buffer.

@@ -345,8 +345,8 @@
void                ibus_engine_update_preedit_text_with_mode
                                                         (IBusEngine *engine,
                                                          IBusText *text,
-                                                         guint cursor_pos,
-                                                         gboolean visible,
+                                                         guint cursor_pos,
+                                                         gboolean visible,
                                                          IBusPreeditFocusMode mode);

Update the pre-edit buffer with commit mode. @@ -427,7 +427,7 @@

ibus_engine_update_auxiliary_text ()

void                ibus_engine_update_auxiliary_text   (IBusEngine *engine,
                                                          IBusText *text,
-                                                         gboolean visible);
+ gboolean visible);

Update the auxiliary bar.

@@ -494,7 +494,7 @@

ibus_engine_update_lookup_table ()

void                ibus_engine_update_lookup_table     (IBusEngine *engine,
                                                          IBusLookupTable *lookup_table,
-                                                         gboolean visible);
+ gboolean visible);

Update the lookup table.

@@ -530,7 +530,7 @@
void                ibus_engine_update_lookup_table_fast
                                                         (IBusEngine *engine,
                                                          IBusLookupTable *lookup_table,
-                                                         gboolean visible);
+ gboolean visible);

Fast update for big lookup table.

@@ -600,9 +600,9 @@

ibus_engine_forward_key_event ()

void                ibus_engine_forward_key_event       (IBusEngine *engine,
-                                                         guint keyval,
-                                                         guint keycode,
-                                                         guint state);
+ guint keyval, + guint keycode, + guint state);

Forward the key event.

@@ -694,8 +694,8 @@

ibus_engine_delete_surrounding_text ()

void                ibus_engine_delete_surrounding_text (IBusEngine *engine,
-                                                         gint offset,
-                                                         guint nchars);
+ gint offset, + guint nchars);

Delete surrounding text.

@@ -723,7 +723,7 @@

ibus_engine_get_name ()

-
const gchar *       ibus_engine_get_name                (IBusEngine *engine);
+
const gchar *       ibus_engine_get_name                (IBusEngine *engine);

Return the name of IBusEngine.

@@ -756,7 +756,7 @@

The "name" property

-
  "name"                     gchar*                : Read / Write / Construct Only
+
  "name"                     gchar*                : Read / Write / Construct Only

Name of this IBusEngine.

@@ -768,10 +768,10 @@

The "candidate-clicked" signal

void                user_function                      (IBusEngine *engine,
-                                                        guint       index,
-                                                        guint       button,
-                                                        guint       state,
-                                                        gpointer    user_data)      : Run Last
+ guint index, + guint button, + guint state, + gpointer user_data) : Run Last

Emitted when candidate on lookup table is clicked. Implement the member function candidate_clicked() in extended class to receive this signal. @@ -818,7 +818,7 @@

The "cursor-down" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the down cursor button is pressed. Implement the member function cursor_down() in extended class to receive this signal. @@ -850,7 +850,7 @@

The "cursor-up" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the up cursor button is pressed. Implement the member function cursor_up() in extended class to receive this signal. @@ -882,7 +882,7 @@

The "disable" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the IME is disabled. Implement the member function set_disable() in extended class to receive this signal. @@ -915,7 +915,7 @@

The "enable" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the IME is enabled. Implement the member function set_enable() in extended class to receive this signal. @@ -948,7 +948,7 @@

The "focus-in" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the client application get the focus. Implement the member function focus_in() in extended class to receive this signal. @@ -981,7 +981,7 @@

The "focus-out" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the client application lost the focus. Implement the member function focus_out() in extended class to receive this signal. @@ -1014,7 +1014,7 @@

The "page-down" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the page-down button is pressed. Implement the member function page_down() in extended class to receive this signal. @@ -1046,7 +1046,7 @@

The "page-up" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the page-up button is pressed. Implement the member function page_up() in extended class to receive this signal. @@ -1077,11 +1077,11 @@


The "process-key-event" signal

-
gboolean            user_function                      (IBusEngine *engine,
-                                                        guint       keyval,
-                                                        guint       keycode,
-                                                        guint       state,
-                                                        gpointer    user_data)      : Run Last
+
gboolean            user_function                      (IBusEngine *engine,
+                                                        guint       keyval,
+                                                        guint       keycode,
+                                                        guint       state,
+                                                        gpointer    user_data)      : Run Last

Emitted when a key event is received. Implement the member function process_key_event() in extended class to receive this signal. @@ -1133,9 +1133,9 @@

The "property-activate" signal

void                user_function                      (IBusEngine *engine,
-                                                        gchar      *name,
-                                                        guint       state,
-                                                        gpointer    user_data)      : Run Last
+ gchar *name, + guint state, + gpointer user_data) : Run Last

Emitted when a property is activated or change changed. Implement the member function property_activate() in extended class to receive this signal. @@ -1177,8 +1177,8 @@

The "property-hide" signal

void                user_function                      (IBusEngine *engine,
-                                                        gchar      *name,
-                                                        gpointer    user_data)      : Run Last
+ gchar *name, + gpointer user_data) : Run Last

Emitted when a property is hidden. Implement the member function property_hide() in extended class to receive this signal. @@ -1215,8 +1215,8 @@

The "property-show" signal

void                user_function                      (IBusEngine *engine,
-                                                        gchar      *name,
-                                                        gpointer    user_data)      : Run Last
+ gchar *name, + gpointer user_data) : Run Last

Emitted when a property is shown. Implement the member function property_side() in extended class to receive this signal. @@ -1253,7 +1253,7 @@

The "reset" signal

void                user_function                      (IBusEngine *engine,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the IME is reset. Implement the member function reset() in extended class to receive this signal. @@ -1286,8 +1286,8 @@

The "set-capabilities" signal

void                user_function                      (IBusEngine *engine,
-                                                        guint       caps,
-                                                        gpointer    user_data)      : Run Last
+ guint caps, + gpointer user_data) : Run Last

Emitted when the client application capabilities is set. Implement the member function set_capabilities() in extended class to receive this signal. @@ -1325,11 +1325,11 @@

The "set-cursor-location" signal

void                user_function                      (IBusEngine *engine,
-                                                        gint        x,
-                                                        gint        y,
-                                                        gint        w,
-                                                        gint        h,
-                                                        gpointer    user_data)      : Run Last
+ gint x, + gint y, + gint w, + gint h, + gpointer user_data) : Run Last

Emitted when the location of IME is set. Implement the member function set_cursor_location() in extended class to receive this signal. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusFactory.html ibus-1.3.8/docs/reference/ibus/html/IBusFactory.html --- ibus-1.3.7/docs/reference/ibus/html/IBusFactory.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusFactory.html 2010-10-22 06:16:35.000000000 +0000 @@ -49,15 +49,15 @@ IBusFactoryClass; IBusFactory * ibus_factory_new (IBusConnection *connection); void ibus_factory_add_engine (IBusFactory *factory, - const gchar *engine_name, - GType engine_type); + const gchar *engine_name, + GType engine_type);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusService
                      +----IBusFactory
@@ -128,8 +128,8 @@
 

ibus_factory_add_engine ()

void                ibus_factory_add_engine             (IBusFactory *factory,
-                                                         const gchar *engine_name,
-                                                         GType engine_type);
+ const gchar *engine_name, + GType engine_type);

Add an engine to the factory.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusHotkeyProfile.html ibus-1.3.8/docs/reference/ibus/html/IBusHotkeyProfile.html --- ibus-1.3.7/docs/reference/ibus/html/IBusHotkeyProfile.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusHotkeyProfile.html 2010-10-22 06:16:35.000000000 +0000 @@ -47,34 +47,34 @@

Synopsis

                    IBusHotkeyProfile;
                     IBusHotkeyProfileClass;
-gboolean            ibus_hotkey_profile_add_hotkey      (IBusHotkeyProfile *profile,
-                                                         guint keyval,
-                                                         guint modifiers,
-                                                         GQuark event);
-gboolean            ibus_hotkey_profile_add_hotkey_from_string
+gboolean            ibus_hotkey_profile_add_hotkey      (IBusHotkeyProfile *profile,
+                                                         guint keyval,
+                                                         guint modifiers,
+                                                         GQuark event);
+gboolean            ibus_hotkey_profile_add_hotkey_from_string
                                                         (IBusHotkeyProfile *profile,
-                                                         const gchar *str,
-                                                         GQuark event);
-gboolean            ibus_hotkey_profile_remove_hotkey   (IBusHotkeyProfile *profile,
-                                                         guint keyval,
-                                                         guint modifiers);
-gboolean            ibus_hotkey_profile_remove_hotkey_by_event
+                                                         const gchar *str,
+                                                         GQuark event);
+gboolean            ibus_hotkey_profile_remove_hotkey   (IBusHotkeyProfile *profile,
+                                                         guint keyval,
+                                                         guint modifiers);
+gboolean            ibus_hotkey_profile_remove_hotkey_by_event
                                                         (IBusHotkeyProfile *profile,
-                                                         GQuark event);
-GQuark              ibus_hotkey_profile_filter_key_event
+                                                         GQuark event);
+GQuark              ibus_hotkey_profile_filter_key_event
                                                         (IBusHotkeyProfile *profile,
-                                                         guint keyval,
-                                                         guint modifiers,
-                                                         guint prev_keyval,
-                                                         guint prev_modifiers,
-                                                         gpointer user_data);
+                                                         guint keyval,
+                                                         guint modifiers,
+                                                         guint prev_keyval,
+                                                         guint prev_modifiers,
+                                                         gpointer user_data);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusHotkeyProfile
@@ -118,10 +118,10 @@
 

ibus_hotkey_profile_add_hotkey ()

-
gboolean            ibus_hotkey_profile_add_hotkey      (IBusHotkeyProfile *profile,
-                                                         guint keyval,
-                                                         guint modifiers,
-                                                         GQuark event);
+
gboolean            ibus_hotkey_profile_add_hotkey      (IBusHotkeyProfile *profile,
+                                                         guint keyval,
+                                                         guint modifiers,
+                                                         GQuark event);

Add a hotkey and its associated event to an IBusHotkeyProfile.

@@ -159,10 +159,10 @@

ibus_hotkey_profile_add_hotkey_from_string ()

-
gboolean            ibus_hotkey_profile_add_hotkey_from_string
+
gboolean            ibus_hotkey_profile_add_hotkey_from_string
                                                         (IBusHotkeyProfile *profile,
-                                                         const gchar *str,
-                                                         GQuark event);
+ const gchar *str, + GQuark event);

Add a hotkey and its associated event to an IBusHotkeyProfile. The hotkey is in string format, such like Control+Shift+A. @@ -196,9 +196,9 @@


ibus_hotkey_profile_remove_hotkey ()

-
gboolean            ibus_hotkey_profile_remove_hotkey   (IBusHotkeyProfile *profile,
-                                                         guint keyval,
-                                                         guint modifiers);
+
gboolean            ibus_hotkey_profile_remove_hotkey   (IBusHotkeyProfile *profile,
+                                                         guint keyval,
+                                                         guint modifiers);

Remove the hotkey for an IBusHotkeyProfile.

@@ -231,9 +231,9 @@

ibus_hotkey_profile_remove_hotkey_by_event ()

-
gboolean            ibus_hotkey_profile_remove_hotkey_by_event
+
gboolean            ibus_hotkey_profile_remove_hotkey_by_event
                                                         (IBusHotkeyProfile *profile,
-                                                         GQuark event);
+ GQuark event);

Remove the hotkey for an IBusHotkeyProfile by event.

@@ -261,13 +261,13 @@

ibus_hotkey_profile_filter_key_event ()

-
GQuark              ibus_hotkey_profile_filter_key_event
+
GQuark              ibus_hotkey_profile_filter_key_event
                                                         (IBusHotkeyProfile *profile,
-                                                         guint keyval,
-                                                         guint modifiers,
-                                                         guint prev_keyval,
-                                                         guint prev_modifiers,
-                                                         gpointer user_data);
+ guint keyval, + guint modifiers, + guint prev_keyval, + guint prev_modifiers, + gpointer user_data);

Emit a ::trigger signal when a hotkey is in a profile.

@@ -321,9 +321,9 @@

The "trigger" signal

void                user_function                      (IBusHotkeyProfile *profile,
-                                                        guint              event,
-                                                        gpointer           user_data,
-                                                        gpointer           user_data)      : Run Last / Has Details
+ guint event, + gpointer user_data, + gpointer user_data) : Run Last / Has Details

Emitted when a hotkey is pressed and the hotkey is in profile. Implement the member function trigger() in extended class to receive this signal. diff -Nru ibus-1.3.7/docs/reference/ibus/html/ibus-ibuserror.html ibus-1.3.8/docs/reference/ibus/html/ibus-ibuserror.html --- ibus-1.3.7/docs/reference/ibus/html/ibus-ibuserror.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ibus-ibuserror.html 2010-10-22 06:16:35.000000000 +0000 @@ -43,12 +43,12 @@

Synopsis

typedef             IBusError;
 IBusError *         ibus_error_new                      (void);
-IBusError *         ibus_error_new_from_text            (const gchar *name,
-                                                         const gchar *message);
-IBusError *         ibus_error_new_from_printf          (const gchar *name,
-                                                         const gchar *format_message,
+IBusError *         ibus_error_new_from_text            (const gchar *name,
+                                                         const gchar *message);
+IBusError *         ibus_error_new_from_printf          (const gchar *name,
+                                                         const gchar *format_message,
                                                          ...);
-IBusError *         ibus_error_new_from_message         (DBusMessage *message);
+IBusError *         ibus_error_new_from_message         (IBusMessage *message);
 void                ibus_error_free                     (IBusError *error);
 
@@ -63,8 +63,6 @@

Details

IBusError

-
typedef DBusError IBusError;
-

A data type representing an IBusError. An IBusError is actually a DBusError. @@ -92,8 +90,8 @@


ibus_error_new_from_text ()

-
IBusError *         ibus_error_new_from_text            (const gchar *name,
-                                                         const gchar *message);
+
IBusError *         ibus_error_new_from_text            (const gchar *name,
+                                                         const gchar *message);

New an IBusError from error name and message.

@@ -121,8 +119,8 @@

ibus_error_new_from_printf ()

-
IBusError *         ibus_error_new_from_printf          (const gchar *name,
-                                                         const gchar *format_message,
+
IBusError *         ibus_error_new_from_printf          (const gchar *name,
+                                                         const gchar *format_message,
                                                          ...);

New an IBusError from error name and a printf-formatted message. @@ -156,7 +154,7 @@


ibus_error_new_from_message ()

-
IBusError *         ibus_error_new_from_message         (DBusMessage *message);
+
IBusError *         ibus_error_new_from_message         (IBusMessage *message);

New an IBusError from a IBusMessage.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/ibus-ibusmainloop.html ibus-1.3.8/docs/reference/ibus/html/ibus-ibusmainloop.html --- ibus-1.3.7/docs/reference/ibus/html/ibus-ibusmainloop.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ibus-ibusmainloop.html 2010-10-22 06:16:35.000000000 +0000 @@ -42,12 +42,12 @@

Synopsis

void                (*DBusConnectionSetupFunc)          (DBusConnection *connection,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 void                (*DBusServerSetupFunc)              (DBusServer *server,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 void                ibus_mainloop_setup                 (DBusConnectionSetupFunc connection_func,
                                                          DBusServerSetupFunc server_func,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 void                ibus_dbus_server_setup              (DBusServer *server);
 void                ibus_dbus_connection_setup          (DBusConnection *connection);
 
@@ -64,7 +64,7 @@

DBusConnectionSetupFunc ()

void                (*DBusConnectionSetupFunc)          (DBusConnection *connection,
-                                                         gpointer user_data);
+ gpointer user_data);

A prototype of callback to DBus connection setup function.

@@ -88,7 +88,7 @@

DBusServerSetupFunc ()

void                (*DBusServerSetupFunc)              (DBusServer *server,
-                                                         gpointer user_data);
+ gpointer user_data);

A prototype of DBus server setup function.

@@ -113,15 +113,15 @@

ibus_mainloop_setup ()

void                ibus_mainloop_setup                 (DBusConnectionSetupFunc connection_func,
                                                          DBusServerSetupFunc server_func,
-                                                         gpointer user_data);
+ gpointer user_data);

Sets the watch and timeout functions of a DBusConnection and DBusServer to integrate the connection with the GLib main loop.

-Parameter user_data should be in type GMainContext. +Parameter user_data should be in type GMainContext. It will be passed to both callback functions, -however, normally NULL is sufficient. +however, normally NULL is sufficient.

If called twice for the same user_data, does nothing the second diff -Nru ibus-1.3.7/docs/reference/ibus/html/ibus-IBusMessage.html ibus-1.3.8/docs/reference/ibus/html/ibus-IBusMessage.html --- ibus-1.3.7/docs/reference/ibus/html/ibus-IBusMessage.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ibus-IBusMessage.html 2010-10-22 06:16:35.000000000 +0000 @@ -48,106 +48,106 @@ #define IBUS_TYPE_VARIANT typedef IBusMessage; typedef IBusMessageIter; -GType ibus_type_get_object_path (void); -GType ibus_type_get_array (void); -GType ibus_type_get_struct (void); -GType ibus_type_get_dict_entry (void); -GType ibus_type_get_variant (void); -IBusMessage * ibus_message_new (gint message_type); +GType ibus_type_get_object_path (void); +GType ibus_type_get_array (void); +GType ibus_type_get_struct (void); +GType ibus_type_get_dict_entry (void); +GType ibus_type_get_variant (void); +IBusMessage * ibus_message_new (gint message_type); IBusMessage * ibus_message_ref (IBusMessage *message); void ibus_message_unref (IBusMessage *message); -IBusMessage * ibus_message_new_method_call (const gchar *destination, - const gchar *path, - const gchar *interface, - const gchar *method); +IBusMessage * ibus_message_new_method_call (const gchar *destination, + const gchar *path, + const gchar *interface, + const gchar *method); IBusMessage * ibus_message_new_method_return (IBusMessage *reply_to); IBusMessage * ibus_message_new_error (IBusMessage *reply_to, - const gchar *error_name, - const gchar *error_message); + const gchar *error_name, + const gchar *error_message); IBusMessage * ibus_message_new_error_printf (IBusMessage *reply_to, - const gchar *error_name, - const gchar *error_format, + const gchar *error_name, + const gchar *error_format, ...); -IBusMessage * ibus_message_new_signal (const gchar *path, - const gchar *interface, - const gchar *method); -gboolean ibus_message_is_method_call (IBusMessage *message, - const gchar *interface, - const gchar *method); -gboolean ibus_message_is_error (IBusMessage *message, - const gchar *error_name); -gboolean ibus_message_is_signal (IBusMessage *message, - const gchar *interface, - const gchar *signal_name); -gboolean ibus_message_set_destination (IBusMessage *message, - const gchar *destination); -gboolean ibus_message_set_sender (IBusMessage *message, - const gchar *sender); -gboolean ibus_message_set_error_name (IBusMessage *message, - const gchar *error_name); -gboolean ibus_message_set_interface (IBusMessage *message, - const gchar *interface); -gboolean ibus_message_set_member (IBusMessage *message, - const gchar *member); -gboolean ibus_message_set_path (IBusMessage *message, - const gchar *path); +IBusMessage * ibus_message_new_signal (const gchar *path, + const gchar *interface, + const gchar *method); +gboolean ibus_message_is_method_call (IBusMessage *message, + const gchar *interface, + const gchar *method); +gboolean ibus_message_is_error (IBusMessage *message, + const gchar *error_name); +gboolean ibus_message_is_signal (IBusMessage *message, + const gchar *interface, + const gchar *signal_name); +gboolean ibus_message_set_destination (IBusMessage *message, + const gchar *destination); +gboolean ibus_message_set_sender (IBusMessage *message, + const gchar *sender); +gboolean ibus_message_set_error_name (IBusMessage *message, + const gchar *error_name); +gboolean ibus_message_set_interface (IBusMessage *message, + const gchar *interface); +gboolean ibus_message_set_member (IBusMessage *message, + const gchar *member); +gboolean ibus_message_set_path (IBusMessage *message, + const gchar *path); void ibus_message_set_no_reply (IBusMessage *message, - gboolean no_reply); -gboolean ibus_message_set_reply_serial (IBusMessage *message, - guint32 reply_serial); -gint ibus_message_get_type (IBusMessage *message); -const gchar * ibus_message_get_destination (IBusMessage *message); -const gchar * ibus_message_get_sender (IBusMessage *message); -const gchar * ibus_message_get_error_name (IBusMessage *message); -const gchar * ibus_message_get_error_message (IBusMessage *message); -const gchar * ibus_message_get_interface (IBusMessage *message); -const gchar * ibus_message_get_member (IBusMessage *message); -const gchar * ibus_message_get_path (IBusMessage *message); -gboolean ibus_message_get_no_reply (IBusMessage *message); -guint32 ibus_message_get_reply_serial (IBusMessage *message); -guint32 ibus_message_get_serial (IBusMessage *message); -gboolean ibus_message_append_args (IBusMessage *message, - GType first_arg_type, + gboolean no_reply); +gboolean ibus_message_set_reply_serial (IBusMessage *message, + guint32 reply_serial); +gint ibus_message_get_type (IBusMessage *message); +const gchar * ibus_message_get_destination (IBusMessage *message); +const gchar * ibus_message_get_sender (IBusMessage *message); +const gchar * ibus_message_get_error_name (IBusMessage *message); +const gchar * ibus_message_get_error_message (IBusMessage *message); +const gchar * ibus_message_get_interface (IBusMessage *message); +const gchar * ibus_message_get_member (IBusMessage *message); +const gchar * ibus_message_get_path (IBusMessage *message); +gboolean ibus_message_get_no_reply (IBusMessage *message); +guint32 ibus_message_get_reply_serial (IBusMessage *message); +guint32 ibus_message_get_serial (IBusMessage *message); +gboolean ibus_message_append_args (IBusMessage *message, + GType first_arg_type, ...); -gboolean ibus_message_append_args_valist (IBusMessage *message, - GType first_arg_type, +gboolean ibus_message_append_args_valist (IBusMessage *message, + GType first_arg_type, va_list va_args); -gboolean ibus_message_get_args (IBusMessage *message, +gboolean ibus_message_get_args (IBusMessage *message, IBusError **error, - GType first_arg_type, + GType first_arg_type, ...); -gboolean ibus_message_get_args_valist (IBusMessage *message, +gboolean ibus_message_get_args_valist (IBusMessage *message, IBusError **error, - GType first_arg_type, + GType first_arg_type, va_list va_args); void ibus_message_iter_init_append (IBusMessage *message, IBusMessageIter *iter); -gboolean ibus_message_iter_append (IBusMessageIter *iter, - GType type, - gconstpointer value); -gboolean ibus_message_iter_copy_data (IBusMessageIter *dst, +gboolean ibus_message_iter_append (IBusMessageIter *iter, + GType type, + gconstpointer value); +gboolean ibus_message_iter_copy_data (IBusMessageIter *dst, IBusMessageIter *src); -gboolean ibus_message_iter_init (IBusMessage *message, +gboolean ibus_message_iter_init (IBusMessage *message, IBusMessageIter *iter); void ibus_message_iter_get_basic (IBusMessageIter *iter, - gpointer value); -gboolean ibus_message_iter_get (IBusMessageIter *iter, - GType type, - gpointer value); -gboolean ibus_message_iter_next (IBusMessageIter *iter); -gboolean ibus_message_iter_has_next (IBusMessageIter *iter); -gboolean ibus_message_iter_open_container (IBusMessageIter *iter, - GType type, - const gchar *contained_signature, + gpointer value); +gboolean ibus_message_iter_get (IBusMessageIter *iter, + GType type, + gpointer value); +gboolean ibus_message_iter_next (IBusMessageIter *iter); +gboolean ibus_message_iter_has_next (IBusMessageIter *iter); +gboolean ibus_message_iter_open_container (IBusMessageIter *iter, + GType type, + const gchar *contained_signature, IBusMessageIter *sub); -gboolean ibus_message_iter_close_container (IBusMessageIter *iter, +gboolean ibus_message_iter_close_container (IBusMessageIter *iter, IBusMessageIter *sub); -gboolean ibus_message_iter_recurse (IBusMessageIter *iter, - GType type, +gboolean ibus_message_iter_recurse (IBusMessageIter *iter, + GType type, IBusMessageIter *sub); -GType ibus_message_iter_get_arg_type (IBusMessageIter *iter); -GType ibus_message_iter_get_element_type (IBusMessageIter *iter); -gchar * ibus_message_to_string (IBusMessage *message); +GType ibus_message_iter_get_arg_type (IBusMessageIter *iter); +GType ibus_message_iter_get_element_type (IBusMessageIter *iter); +gchar * ibus_message_to_string (IBusMessage *message);

@@ -210,8 +210,6 @@

IBusMessage

-
typedef DBusMessage IBusMessage;
-

An opaque data structure that represents IBusMessage.

@@ -219,8 +217,6 @@

IBusMessageIter

-
typedef DBusMessageIter IBusMessageIter;
-

An opaque data structure that represents IBusMessageIter.

@@ -228,7 +224,7 @@

ibus_type_get_object_path ()

-
GType               ibus_type_get_object_path           (void);
+
GType               ibus_type_get_object_path           (void);

Gets the type of object path.

@@ -244,7 +240,7 @@

ibus_type_get_array ()

-
GType               ibus_type_get_array                 (void);
+
GType               ibus_type_get_array                 (void);

Gets the type of IBusArray.

@@ -260,7 +256,7 @@

ibus_type_get_struct ()

-
GType               ibus_type_get_struct                (void);
+
GType               ibus_type_get_struct                (void);

Gets the type of IBusStruct.

@@ -276,7 +272,7 @@

ibus_type_get_dict_entry ()

-
GType               ibus_type_get_dict_entry            (void);
+
GType               ibus_type_get_dict_entry            (void);

Gets the type of IBusDictEntry.

@@ -292,7 +288,7 @@

ibus_type_get_variant ()

-
GType               ibus_type_get_variant               (void);
+
GType               ibus_type_get_variant               (void);

Gets the type of IBusVariant.

@@ -308,7 +304,7 @@

ibus_message_new ()

-
IBusMessage *       ibus_message_new                    (gint message_type);
+
IBusMessage *       ibus_message_new                    (gint message_type);

New an IBusMessage. Valid D-Bus message types include: @@ -380,21 +376,21 @@


ibus_message_new_method_call ()

-
IBusMessage *       ibus_message_new_method_call        (const gchar *destination,
-                                                         const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *method);
+
IBusMessage *       ibus_message_new_method_call        (const gchar *destination,
+                                                         const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *method);

Constructs a new message to invoke a method on a remote object.

-The destination may be NULL in which case no destination is set; +The destination may be NULL in which case no destination is set; this is appropriate when using IBus/D-Bus in a peer-to-peer context (no message bus). -The interface may be NULL, which means that if multiple methods with the given name +The interface may be NULL, which means that if multiple methods with the given name exist it is undefined which one will be invoked.

-The path and method names may not be NULL. +The path and method names may not be NULL.

Destination, path, interface, and method name can't contain any invalid characters @@ -405,7 +401,7 @@

- @@ -415,7 +411,7 @@ - @@ -425,7 +421,7 @@ - @@ -448,7 +444,7 @@ - @@ -458,8 +454,8 @@

ibus_message_new_error ()

IBusMessage *       ibus_message_new_error              (IBusMessage *reply_to,
-                                                         const gchar *error_name,
-                                                         const gchar *error_message);
+ const gchar *error_name, + const gchar *error_message);

Creates a new message that is an error reply to another message. Error replies are most common in response to method calls, but can be returned in reply to any message. @@ -484,12 +480,12 @@

- - @@ -499,8 +495,8 @@

ibus_message_new_error_printf ()

IBusMessage *       ibus_message_new_error_printf       (IBusMessage *reply_to,
-                                                         const gchar *error_name,
-                                                         const gchar *error_format,
+                                                         const gchar *error_name,
+                                                         const gchar *error_format,
                                                          ...);

Creates a new message that is an error reply to another message. @@ -533,7 +529,7 @@

- @@ -542,9 +538,9 @@

ibus_message_new_signal ()

-
IBusMessage *       ibus_message_new_signal             (const gchar *path,
-                                                         const gchar *interface,
-                                                         const gchar *method);
+
IBusMessage *       ibus_message_new_signal             (const gchar *path,
+                                                         const gchar *interface,
+                                                         const gchar *method);

Constructs a new message representing a signal emission. Returns NULL if memory can't be allocated for the message. @@ -561,7 +557,7 @@

- @@ -571,7 +567,7 @@ - @@ -580,9 +576,9 @@

ibus_message_is_method_call ()

-
gboolean            ibus_message_is_method_call         (IBusMessage *message,
-                                                         const gchar *interface,
-                                                         const gchar *method);
+
gboolean            ibus_message_is_method_call         (IBusMessage *message,
+                                                         const gchar *interface,
+                                                         const gchar *method);

Checks whether the message is a method call with the given interface and member fields.

@@ -602,19 +598,19 @@
- - @@ -623,8 +619,8 @@

ibus_message_is_error ()

-
gboolean            ibus_message_is_error               (IBusMessage *message,
-                                                         const gchar *error_name);
+
gboolean            ibus_message_is_error               (IBusMessage *message,
+                                                         const gchar *error_name);

Checks whether the message is an error reply with the given error name. If the message is not DBUS_MESSAGE_TYPE_ERROR, or has a different name, returns FALSE. @@ -645,8 +641,8 @@

@@ -655,12 +651,12 @@

ibus_message_is_signal ()

-
gboolean            ibus_message_is_signal              (IBusMessage *message,
-                                                         const gchar *interface,
-                                                         const gchar *signal_name);
+
gboolean            ibus_message_is_signal              (IBusMessage *message,
+                                                         const gchar *interface,
+                                                         const gchar *signal_name);

Checks whether the message is a signal with the given interface and member fields. -If the message is not DBUS_MESSAGE_TYPE_SIGNAL, or has a different interface or member field, returns FALSE. +If the message is not DBUS_MESSAGE_TYPE_SIGNAL, or has a different interface or member field, returns FALSE.

GArray *attributes;

GArray *attributes;

GArray that holds IBusAttribute.

Returns :

Owner of the name. The returned value must be freed with g_free(). +Owner of the name. The returned value must be freed with g_free().

Returns :

The named of currently focued IBusInputContext if the "CurrentInputContext" call suceeded, NULL otherwise. The return - value must be freed with g_free(). + value must be freed with g_free().

gchar *name;

gchar *name;

Name of the component.

gchar *description;

gchar *description;

Detailed description of component.

gchar *version;

gchar *version;

Component version.

gchar *license;

gchar *license;

Distribution license of this component.

gchar *author;

gchar *author;

Author(s) of the component.

gchar *homepage;

gchar *homepage;

Homepage of the component.

gchar *exec;

gchar *exec;

path to component executable.

gchar *textdomain;

gchar *textdomain;

Domain name for dgettext()

gchar *name;

gchar *name;

Name of the engine.

gchar *longname;

gchar *longname;

Long name of the input method engine.

gchar *description;

gchar *description;

Input method engine description.

gchar *language;

gchar *language;

Language (e.g. zh, jp) supported by this input method engine.

gchar *license;

gchar *license;

License of the input method engine.

gchar *author;

gchar *author;

Author of the input method engine.

gchar *icon;

gchar *icon;

Icon file of this engine.

gchar *layout;

gchar *layout;

Keyboard layout

gchar *hotkeys;

gchar *hotkeys;

One or more hotkeys for switching to this engine, separated by semi-colon.

guint rank;

guint rank;

Preference rank among engines, the highest ranked IME will put in the front.

gboolean enabled;

gboolean enabled;

Whether the engine is enabled.

gboolean has_focus;

gboolean has_focus;

Whether the engine has focus.

guint client_capabilities;

guint client_capabilities;

IBusCapabilite (client capabilities) flags.

destination :

Where this message to be sent to or NULL for no destination. +Where this message to be sent to or NULL for no destination.

interface :

Interface to invoke method on, or NULL. +Interface to invoke method on, or NULL.

Returns :

A newly allocate IBusMessage; or NULL if memory cannot be allocated. +A newly allocate IBusMessage; or NULL if memory cannot be allocated.

Returns :

A newly allocate IBusMessage; or NULL if memory cannot be allocated. +A newly allocate IBusMessage; or NULL if memory cannot be allocated.

error_message :

Detailed error message string (or NULL for none, but please give a message). +Detailed error message string (or NULL for none, but please give a message).

Returns :

A newly allocate IBusMessage with the error information; or NULL if memory cannot be allocated. +A newly allocate IBusMessage with the error information; or NULL if memory cannot be allocated.

Returns :

A newly allocate IBusMessage with the error information; or NULL if memory cannot be allocated. +A newly allocate IBusMessage with the error information; or NULL if memory cannot be allocated.

interface :

Interface to invoke method on, or NULL. +Interface to invoke method on, or NULL.

Returns :

A newly allocate IBusMessage with the error information; or NULL if memory cannot be allocated. +A newly allocate IBusMessage with the error information; or NULL if memory cannot be allocated.

interface :

The interface to check. Cannot be NULL. +The interface to check. Cannot be NULL.

method :

The method to check. Cannot be NULL. +The method to check. Cannot be NULL.

Returns :

-TRUE if message is DBUS_MESSAGE_TYPE_METHOD_CALL and the invoked method is matched with method; - FALSE otherwise. +TRUE if message is DBUS_MESSAGE_TYPE_METHOD_CALL and the invoked method is matched with method; + FALSE otherwise.

Returns :

-TRUE if message is DBUS_MESSAGE_TYPE_ERROR and the error name is matched with error_name; - FALSE otherwise. +TRUE if message is DBUS_MESSAGE_TYPE_ERROR and the error name is matched with error_name; + FALSE otherwise.
@@ -672,7 +668,7 @@ - @@ -683,8 +679,8 @@ @@ -693,8 +689,8 @@

ibus_message_set_destination ()

-
gboolean            ibus_message_set_destination        (IBusMessage *message,
-                                                         const gchar *destination);
+
gboolean            ibus_message_set_destination        (IBusMessage *message,
+                                                         const gchar *destination);

Sets the message's destination.

@@ -716,13 +712,13 @@
- @@ -731,8 +727,8 @@

ibus_message_set_sender ()

-
gboolean            ibus_message_set_sender             (IBusMessage *message,
-                                                         const gchar *sender);
+
gboolean            ibus_message_set_sender             (IBusMessage *message,
+                                                         const gchar *sender);

Sets the message sender.

@@ -753,13 +749,13 @@
- @@ -768,8 +764,8 @@

ibus_message_set_error_name ()

-
gboolean            ibus_message_set_error_name         (IBusMessage *message,
-                                                         const gchar *error_name);
+
gboolean            ibus_message_set_error_name         (IBusMessage *message,
+                                                         const gchar *error_name);

Sets the name of the error (DBUS_MESSAGE_TYPE_ERROR).

@@ -789,13 +785,13 @@
- @@ -804,8 +800,8 @@

ibus_message_set_interface ()

-
gboolean            ibus_message_set_interface          (IBusMessage *message,
-                                                         const gchar *interface);
+
gboolean            ibus_message_set_interface          (IBusMessage *message,
+                                                         const gchar *interface);

Sets the interface this message is being sent to (for DBUS_MESSAGE_TYPE_METHOD_CALL) or the interface @@ -824,13 +820,13 @@

- @@ -839,8 +835,8 @@

ibus_message_set_member ()

-
gboolean            ibus_message_set_member             (IBusMessage *message,
-                                                         const gchar *member);
+
gboolean            ibus_message_set_member             (IBusMessage *message,
+                                                         const gchar *member);

Sets the interface member being invoked (DBUS_MESSAGE_TYPE_METHOD_CALL) or emitted (DBUS_MESSAGE_TYPE_SIGNAL). @@ -858,13 +854,13 @@

- @@ -873,8 +869,8 @@

ibus_message_set_path ()

-
gboolean            ibus_message_set_path               (IBusMessage *message,
-                                                         const gchar *path);
+
gboolean            ibus_message_set_path               (IBusMessage *message,
+                                                         const gchar *path);

Sets the object path this message is being sent to (for $DBUS_MESSAGE_TYPE_METHOD_CALL) or the one a signal is being emitted from (for DBUS_MESSAGE_TYPE_SIGNAL). @@ -892,13 +888,13 @@

- @@ -908,7 +904,7 @@

ibus_message_set_no_reply ()

void                ibus_message_set_no_reply           (IBusMessage *message,
-                                                         gboolean no_reply);
+ gboolean no_reply);

Sets a flag indicating that the message does not want a reply; if this flag is set, the other end of the connection may (but is not required to) @@ -936,7 +932,7 @@

@@ -945,8 +941,8 @@

ibus_message_set_reply_serial ()

-
gboolean            ibus_message_set_reply_serial       (IBusMessage *message,
-                                                         guint32 reply_serial);
+
gboolean            ibus_message_set_reply_serial       (IBusMessage *message,
+                                                         guint32 reply_serial);

Sets the reply serial of a message (the serial of the message this is a reply to).

@@ -966,7 +962,7 @@
@@ -975,7 +971,7 @@

ibus_message_get_type ()

-
gint                ibus_message_get_type               (IBusMessage *message);
+
gint                ibus_message_get_type               (IBusMessage *message);

Gets the type of an IBusMessage.

@@ -998,9 +994,9 @@

ibus_message_get_destination ()

-
const gchar *       ibus_message_get_destination        (IBusMessage *message);
+
const gchar *       ibus_message_get_destination        (IBusMessage *message);

-Gets the destination of a message or NULL if there is none set. +Gets the destination of a message or NULL if there is none set.

The returned string becomes invalid if the message is modified, @@ -1025,10 +1021,10 @@


ibus_message_get_sender ()

-
const gchar *       ibus_message_get_sender             (IBusMessage *message);
+
const gchar *       ibus_message_get_sender             (IBusMessage *message);

Gets the unique name of the connection which originated this message, -or NULL if unknown or inapplicable. +or NULL if unknown or inapplicable.

The sender is filled in by the message bus. @@ -1051,7 +1047,7 @@

- @@ -1060,9 +1056,9 @@

ibus_message_get_error_name ()

-
const gchar *       ibus_message_get_error_name         (IBusMessage *message);
+
const gchar *       ibus_message_get_error_name         (IBusMessage *message);

-Gets the error name (DBUS_MESSAGE_TYPE_ERROR only) or NULL if none. +Gets the error name (DBUS_MESSAGE_TYPE_ERROR only) or NULL if none.

The returned string becomes invalid if the message is modified, @@ -1078,7 +1074,7 @@

- @@ -1087,9 +1083,9 @@

ibus_message_get_error_message ()

-
const gchar *       ibus_message_get_error_message      (IBusMessage *message);
+
const gchar *       ibus_message_get_error_message      (IBusMessage *message);

-Gets the error message (DBUS_MESSAGE_TYPE_ERROR only) or NULL if none. +Gets the error message (DBUS_MESSAGE_TYPE_ERROR only) or NULL if none.

The returned string becomes invalid if the message is modified, @@ -1105,7 +1101,7 @@

- @@ -1114,13 +1110,13 @@

ibus_message_get_interface ()

-
const gchar *       ibus_message_get_interface          (IBusMessage *message);
+
const gchar *       ibus_message_get_interface          (IBusMessage *message);

Gets the interface this message is being sent to (for DBUS_MESSAGE_TYPE_METHOD_CALL) or being emitted from (for DBUS_MESSAGE_TYPE_SIGNAL).

-The interface name is fully-qualified (namespaced). Returns NULL if none. +The interface name is fully-qualified (namespaced). Returns NULL if none.

The returned string becomes invalid if the message is modified, @@ -1136,7 +1132,7 @@

- @@ -1145,13 +1141,13 @@

ibus_message_get_member ()

-
const gchar *       ibus_message_get_member             (IBusMessage *message);
+
const gchar *       ibus_message_get_member             (IBusMessage *message);

Gets the interface member being invoked (DBUS_MESSAGE_TYPE_METHOD_CALL) or emitted (DBUS_MESSAGE_TYPE_SIGNAL).

-Returns NULL if none. +Returns NULL if none.

The returned string becomes invalid if the message is modified, @@ -1167,7 +1163,7 @@

- @@ -1176,13 +1172,13 @@

ibus_message_get_path ()

-
const gchar *       ibus_message_get_path               (IBusMessage *message);
+
const gchar *       ibus_message_get_path               (IBusMessage *message);

Gets the object path this message is being sent to (for DBUS_MESSAGE_TYPE_METHOD_CALL) or being emitted from (for DBUS_MESSAGE_TYPE_SIGNAL).

-Returns NULL if none. +Returns NULL if none.

See also dbus_message_get_path_decomposed(). @@ -1201,7 +1197,7 @@

- @@ -1210,7 +1206,7 @@

ibus_message_get_no_reply ()

-
gboolean            ibus_message_get_no_reply           (IBusMessage *message);
+
gboolean            ibus_message_get_no_reply           (IBusMessage *message);

Returns TRUE if the message does not expect a reply.

@@ -1225,7 +1221,7 @@
@@ -1234,7 +1230,7 @@

ibus_message_get_reply_serial ()

-
guint32             ibus_message_get_reply_serial       (IBusMessage *message);
+
guint32             ibus_message_get_reply_serial       (IBusMessage *message);

Returns the serial that the message is a reply to or 0 if none.

@@ -1257,7 +1253,7 @@

ibus_message_get_serial ()

-
guint32             ibus_message_get_serial             (IBusMessage *message);
+
guint32             ibus_message_get_serial             (IBusMessage *message);

Returns the serial of a message or 0 if none has been specified.

@@ -1290,8 +1286,8 @@

ibus_message_append_args ()

-
gboolean            ibus_message_append_args            (IBusMessage *message,
-                                                         GType first_arg_type,
+
gboolean            ibus_message_append_args            (IBusMessage *message,
+                                                         GType first_arg_type,
                                                          ...);

Appends fields to a message given a variable argument list. @@ -1373,7 +1369,7 @@

@@ -1382,8 +1378,8 @@

ibus_message_append_args_valist ()

-
gboolean            ibus_message_append_args_valist     (IBusMessage *message,
-                                                         GType first_arg_type,
+
gboolean            ibus_message_append_args_valist     (IBusMessage *message,
+                                                         GType first_arg_type,
                                                          va_list va_args);

Like ibus_message_append_args() but takes a va_list for use by language bindings. @@ -1412,7 +1408,7 @@

@@ -1421,9 +1417,9 @@

ibus_message_get_args ()

-
gboolean            ibus_message_get_args               (IBusMessage *message,
+
gboolean            ibus_message_get_args               (IBusMessage *message,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);

Gets arguments from a message given a variable argument list. @@ -1484,7 +1480,7 @@

@@ -1493,9 +1489,9 @@

ibus_message_get_args_valist ()

-
gboolean            ibus_message_get_args_valist        (IBusMessage *message,
+
gboolean            ibus_message_get_args_valist        (IBusMessage *message,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          va_list va_args);

Like ibus_message_get_args but takes a va_list for use by language bindings. @@ -1513,7 +1509,7 @@

- @@ -1529,7 +1525,7 @@ @@ -1562,9 +1558,9 @@

ibus_message_iter_append ()

-
gboolean            ibus_message_iter_append            (IBusMessageIter *iter,
-                                                         GType type,
-                                                         gconstpointer value);
+
gboolean            ibus_message_iter_append            (IBusMessageIter *iter,
+                                                         GType type,
+                                                         gconstpointer value);

Appends a basic-typed value to the message.

@@ -1596,7 +1592,7 @@
@@ -1605,7 +1601,7 @@

ibus_message_iter_copy_data ()

-
gboolean            ibus_message_iter_copy_data         (IBusMessageIter *dst,
+
gboolean            ibus_message_iter_copy_data         (IBusMessageIter *dst,
                                                          IBusMessageIter *src);

Deep copy an IBusMessageIter to another IBusMessageIter. @@ -1626,7 +1622,7 @@

@@ -1636,7 +1632,7 @@

ibus_message_iter_init ()

-
gboolean            ibus_message_iter_init              (IBusMessage *message,
+
gboolean            ibus_message_iter_init              (IBusMessage *message,
                                                          IBusMessageIter *iter);

Initializes an IBusMessageIter for reading the arguments of the message passed in. @@ -1675,7 +1671,7 @@

@@ -1685,7 +1681,7 @@

ibus_message_iter_get_basic ()

void                ibus_message_iter_get_basic         (IBusMessageIter *iter,
-                                                         gpointer value);
+ gpointer value);

Reads a basic-typed value from the message iterator.

@@ -1736,7 +1732,7 @@
- @@ -1745,9 +1741,9 @@

ibus_message_iter_get ()

-
gboolean            ibus_message_iter_get               (IBusMessageIter *iter,
-                                                         GType type,
-                                                         gpointer value);
+
gboolean            ibus_message_iter_get               (IBusMessageIter *iter,
+                                                         GType type,
+                                                         gpointer value);

Gets an value from an IBusMessageIter, then move on to the next element.

@@ -1761,18 +1757,18 @@
- - @@ -1781,12 +1777,12 @@

ibus_message_iter_next ()

-
gboolean            ibus_message_iter_next              (IBusMessageIter *iter);
+
gboolean            ibus_message_iter_next              (IBusMessageIter *iter);

Moves the iterator to the next field, if any.

-If there's no next field, returns FALSE. If the iterator moves forward, returns TRUE. +If there's no next field, returns FALSE. If the iterator moves forward, returns TRUE.

interface :

The interface to checked. Cannot be NULL. +The interface to checked. Cannot be NULL.

Returns :

-TRUE if message is DBUS_MESSAGE_SIGNAL and the signal name is matched with signal_name; - FALSE otherwise. +TRUE if message is DBUS_MESSAGE_SIGNAL and the signal name is matched with signal_name; + FALSE otherwise.

destination :

Destination to set; or NULL to unset. +Destination to set; or NULL to unset.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

sender :

Sender to set; or NULL to unset. +Sender to set; or NULL to unset.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

error_name :

Error name to set; or NULL to unset. +Error name to set; or NULL to unset.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

interface :

Interface to set; or NULL to unset. +Interface to set; or NULL to unset.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

member :

Member to set; or NULL to unset. +Member to set; or NULL to unset.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

path :

Path to set; or NULL to unset. +Path to set; or NULL to unset.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

no_reply :

-TRUE if no reply is desired. +TRUE if no reply is desired.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

Returns :

Sender of the IBusMessage; NULL if unknown or inapplicable. +Sender of the IBusMessage; NULL if unknown or inapplicable.

Returns :

Error name of the IBusMessage; NULL if none. +Error name of the IBusMessage; NULL if none.

Returns :

Error message of the IBusMessage; NULL if none. +Error message of the IBusMessage; NULL if none.

Returns :

Interface name of the IBusMessage; NULL if none. +Interface name of the IBusMessage; NULL if none.

Returns :

Member name of the IBusMessage; NULL if none. +Member name of the IBusMessage; NULL if none.

Returns :

Object path of the IBusMessage; NULL if none. +Object path of the IBusMessage; NULL if none.

Returns :

-TRUE if the message does not expect a reply; FALSE otherwise. +TRUE if the message does not expect a reply; FALSE otherwise.

Returns :

-TRUE if succeed; FALSE otherwise. +TRUE if succeed; FALSE otherwise.

Returns :

-TRUE if succeed; FALSE otherwise. +TRUE if succeed; FALSE otherwise.

Returns :

-TRUE if succeed; FALSE otherwise. +TRUE if succeed; FALSE otherwise.

error :

Error message is outputted here; or NULL to suppress error. +Error message is outputted here; or NULL to suppress error.

Returns :

-TRUE if succeed; FALSE otherwise. +TRUE if succeed; FALSE otherwise.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

Returns :

-TRUE if succeed; FALSE if failed. +TRUE if succeed; FALSE if failed.

Returns :

-TRUE if succeed; FALSE if the message has no arguments. +TRUE if succeed; FALSE if the message has no arguments.

value :

Result value stores here. Cannot be NULL. +Result value stores here. Cannot be NULL.

type :

The type of the value. Cannot be NULL. +The type of the value. Cannot be NULL.

value :

Result value stores here. Cannot be NULL. +Result value stores here. Cannot be NULL.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.
@@ -1799,7 +1795,7 @@ @@ -1808,7 +1804,7 @@

ibus_message_iter_has_next ()

-
gboolean            ibus_message_iter_has_next          (IBusMessageIter *iter);
+
gboolean            ibus_message_iter_has_next          (IBusMessageIter *iter);

Checks if an iterator has any more fields.

@@ -1823,7 +1819,7 @@
@@ -1832,9 +1828,9 @@

ibus_message_iter_open_container ()

-
gboolean            ibus_message_iter_open_container    (IBusMessageIter *iter,
-                                                         GType type,
-                                                         const gchar *contained_signature,
+
gboolean            ibus_message_iter_open_container    (IBusMessageIter *iter,
+                                                         GType type,
+                                                         const gchar *contained_signature,
                                                          IBusMessageIter *sub);

Appends a container-typed value to the message; @@ -1844,7 +1840,7 @@

Container types are for example struct, variant, and array. For variants, the contained_signature should be the type of the single value inside the variant. -For structs and dict entries, contained_signature should be NULL; +For structs and dict entries, contained_signature should be NULL; it will be set to whatever types you write into the struct. For arrays, contained_signature should be the type of the array elements.

@@ -1874,7 +1870,7 @@
@@ -1883,7 +1879,7 @@

ibus_message_iter_close_container ()

-
gboolean            ibus_message_iter_close_container   (IBusMessageIter *iter,
+
gboolean            ibus_message_iter_close_container   (IBusMessageIter *iter,
                                                          IBusMessageIter *sub);

Closes a container-typed value appended to the message; @@ -1906,7 +1902,7 @@

@@ -1915,8 +1911,8 @@

ibus_message_iter_recurse ()

-
gboolean            ibus_message_iter_recurse           (IBusMessageIter *iter,
-                                                         GType type,
+
gboolean            ibus_message_iter_recurse           (IBusMessageIter *iter,
+                                                         GType type,
                                                          IBusMessageIter *sub);

Recurses into a container value when reading values from a message, @@ -1959,7 +1955,7 @@

@@ -1968,7 +1964,7 @@

ibus_message_iter_get_arg_type ()

-
GType               ibus_message_iter_get_arg_type      (IBusMessageIter *iter);
+
GType               ibus_message_iter_get_arg_type      (IBusMessageIter *iter);

Returns the argument type of the argument that the message iterator points to.

@@ -2002,7 +1998,7 @@

ibus_message_iter_get_element_type ()

-
GType               ibus_message_iter_get_element_type  (IBusMessageIter *iter);
+
GType               ibus_message_iter_get_element_type  (IBusMessageIter *iter);

Returns the element type of the array that the message iterator points to. Note that you need to check that the iterator points to an array prior to using this function. @@ -2026,13 +2022,13 @@


ibus_message_to_string ()

-
gchar *             ibus_message_to_string              (IBusMessage *message);
+
gchar *             ibus_message_to_string              (IBusMessage *message);

Produces a pretty formatted string which show the information of the IBusMessage. This string is suitable for debugging information print out.

-Free the string by g_free() after use. +Free the string by g_free() after use.

Returns :

-TRUE if the iterator moves forward successfully; FALSE if next element does not exist. +TRUE if the iterator moves forward successfully; FALSE if next element does not exist.

Returns :

-TRUE if next element exists; FALSE otherwise. +TRUE if next element exists; FALSE otherwise.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.

Returns :

-TRUE if succeed; FALSE if insufficient memory. +TRUE if succeed; FALSE if insufficient memory.
diff -Nru ibus-1.3.7/docs/reference/ibus/html/ibus-IBusPendingCall.html ibus-1.3.8/docs/reference/ibus/html/ibus-IBusPendingCall.html --- ibus-1.3.7/docs/reference/ibus/html/ibus-IBusPendingCall.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ibus-IBusPendingCall.html 2010-10-22 06:16:35.000000000 +0000 @@ -43,27 +43,27 @@

Synopsis

typedef             IBusPendingCall;
 void                (*IBusPendingCallNotifyFunction)    (IBusPendingCall *pending,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 IBusPendingCall*    ibus_pending_call_ref               (IBusPendingCall *pending);
 void                ibus_pending_call_unref             (IBusPendingCall *pending);
-gboolean            ibus_pending_call_set_notify        (IBusPendingCall *pending,
+gboolean            ibus_pending_call_set_notify        (IBusPendingCall *pending,
                                                          IBusPendingCallNotifyFunction function,
-                                                         gpointer user_data,
-                                                         GDestroyNotify free_user_data);
+                                                         gpointer user_data,
+                                                         GDestroyNotify free_user_data);
 void                ibus_pending_call_cancel            (IBusPendingCall *pending);
-gboolean            ibus_pending_call_get_completed     (IBusPendingCall *pending);
+gboolean            ibus_pending_call_get_completed     (IBusPendingCall *pending);
 IBusMessage*        ibus_pending_call_steal_reply       (IBusPendingCall *pending);
 void                ibus_pending_call_block             (IBusPendingCall *pending);
 void                ibus_pending_call_wait              (IBusPendingCall *pending);
-gboolean            ibus_pending_call_allocate_data_slot
-                                                        (gint *slot_p);
-void                ibus_pending_call_free_data_slot    (gint *slot_p);
-gboolean            ibus_pending_call_set_data          (IBusPendingCall *pending,
-                                                         gint slot,
-                                                         gpointer data,
-                                                         GDestroyNotify free_data_func);
-gpointer            ibus_pending_call_get_data          (IBusPendingCall *pending,
-                                                         gint slot);
+gboolean            ibus_pending_call_allocate_data_slot
+                                                        (gint *slot_p);
+void                ibus_pending_call_free_data_slot    (gint *slot_p);
+gboolean            ibus_pending_call_set_data          (IBusPendingCall *pending,
+                                                         gint slot,
+                                                         gpointer data,
+                                                         GDestroyNotify free_data_func);
+gpointer            ibus_pending_call_get_data          (IBusPendingCall *pending,
+                                                         gint slot);
 
@@ -81,8 +81,6 @@

Details

IBusPendingCall

-
typedef DBusPendingCall IBusPendingCall;
-

An opaque data structure that represents IBusPendingCall.

@@ -91,7 +89,7 @@

IBusPendingCallNotifyFunction ()

void                (*IBusPendingCallNotifyFunction)    (IBusPendingCall *pending,
-                                                         gpointer user_data);
+ gpointer user_data);

Callback prototype of pending call notify function.

@@ -153,10 +151,10 @@

ibus_pending_call_set_notify ()

-
gboolean            ibus_pending_call_set_notify        (IBusPendingCall *pending,
+
gboolean            ibus_pending_call_set_notify        (IBusPendingCall *pending,
                                                          IBusPendingCallNotifyFunction function,
-                                                         gpointer user_data,
-                                                         GDestroyNotify free_user_data);
+ gpointer user_data, + GDestroyNotify free_user_data);

Sets a notification function to be called when the reply is received or the pending call times out.

@@ -220,7 +218,7 @@

ibus_pending_call_get_completed ()

-
gboolean            ibus_pending_call_get_completed     (IBusPendingCall *pending);
+
gboolean            ibus_pending_call_get_completed     (IBusPendingCall *pending);

Whether the pending call has received a reply or not.

@@ -312,8 +310,8 @@

ibus_pending_call_allocate_data_slot ()

-
gboolean            ibus_pending_call_allocate_data_slot
-                                                        (gint *slot_p);
+
gboolean            ibus_pending_call_allocate_data_slot
+                                                        (gint *slot_p);

Allocates an integer ID to be used for storing application-specific data on any IBusPendingCall.

@@ -346,7 +344,7 @@

ibus_pending_call_free_data_slot ()

-
void                ibus_pending_call_free_data_slot    (gint *slot_p);
+
void                ibus_pending_call_free_data_slot    (gint *slot_p);

Deallocates a global ID for IBusPendingCall data slots.

@@ -369,10 +367,10 @@

ibus_pending_call_set_data ()

-
gboolean            ibus_pending_call_set_data          (IBusPendingCall *pending,
-                                                         gint slot,
-                                                         gpointer data,
-                                                         GDestroyNotify free_data_func);
+
gboolean            ibus_pending_call_set_data          (IBusPendingCall *pending,
+                                                         gint slot,
+                                                         gpointer data,
+                                                         GDestroyNotify free_data_func);

Stores a pointer on a IBusPendingCall, along with an optional function to be used for freeing the data when the data is set again, or when the pending call is finalized. @@ -414,8 +412,8 @@


ibus_pending_call_get_data ()

-
gpointer            ibus_pending_call_get_data          (IBusPendingCall *pending,
-                                                         gint slot);
+
gpointer            ibus_pending_call_get_data          (IBusPendingCall *pending,
+                                                         gint slot);

Retrieves data previously set with ibus_pending_call_set_data().

diff -Nru ibus-1.3.7/docs/reference/ibus/html/ibus-ibusshare.html ibus-1.3.8/docs/reference/ibus/html/ibus-ibusshare.html --- ibus-1.3.7/docs/reference/ibus/html/ibus-ibusshare.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ibus-ibusshare.html 2010-10-22 06:16:35.000000000 +0000 @@ -58,21 +58,21 @@ #define IBUS_INTERFACE_PANEL #define IBUS_INTERFACE_CONFIG #define IBUS_INTERFACE_NOTIFICATIONS -const gchar * ibus_get_local_machine_id (void); -void ibus_set_display (const gchar *display); -const gchar * ibus_get_address (void); -void ibus_write_address (const gchar *address); -const gchar * ibus_get_user_name (void); -glong ibus_get_daemon_uid (void); -const gchar * ibus_get_socket_path (void); -const gchar * ibus_keyval_name (guint keyval); -guint ibus_keyval_from_name (const gchar *keyval_name); -void ibus_free_strv (gchar **strv); -const gchar * ibus_key_event_to_string (guint keyval, - guint modifiers); -gboolean ibus_key_event_from_string (const gchar *string, - guint *keyval, - guint *modifiers); +const gchar * ibus_get_local_machine_id (void); +void ibus_set_display (const gchar *display); +const gchar * ibus_get_address (void); +void ibus_write_address (const gchar *address); +const gchar * ibus_get_user_name (void); +glong ibus_get_daemon_uid (void); +const gchar * ibus_get_socket_path (void); +const gchar * ibus_keyval_name (guint keyval); +guint ibus_keyval_from_name (const gchar *keyval_name); +void ibus_free_strv (gchar **strv); +const gchar * ibus_key_event_to_string (guint keyval, + guint modifiers); +gboolean ibus_key_event_from_string (const gchar *string, + guint *keyval, + guint *modifiers); void ibus_init (void); void ibus_main (void); void ibus_quit (void); @@ -241,7 +241,7 @@

ibus_get_local_machine_id ()

-
const gchar *       ibus_get_local_machine_id           (void);
+
const gchar *       ibus_get_local_machine_id           (void);

Obtains the machine UUID of the machine this process is running on.

@@ -257,7 +257,7 @@

ibus_set_display ()

-
void                ibus_set_display                    (const gchar *display);
+
void                ibus_set_display                    (const gchar *display);

Set the display address.

@@ -273,7 +273,7 @@

ibus_get_address ()

-
const gchar *       ibus_get_address                    (void);
+
const gchar *       ibus_get_address                    (void);

Return the D-Bus address of IBus. It will find the address from following source: @@ -291,7 +291,7 @@

-

Returns :

D-Bus address of IBus. NULL for not found. +D-Bus address of IBus. NULL for not found.
@@ -299,7 +299,7 @@

ibus_write_address ()

-
void                ibus_write_address                  (const gchar *address);
+
void                ibus_write_address                  (const gchar *address);

Write D-Bus address to socket file.

@@ -318,7 +318,7 @@

ibus_get_user_name ()

-
const gchar *       ibus_get_user_name                  (void);
+
const gchar *       ibus_get_user_name                  (void);

Get the current user name. It is determined by: @@ -346,7 +346,7 @@


ibus_get_daemon_uid ()

-
glong               ibus_get_daemon_uid                 (void);
+
glong               ibus_get_daemon_uid                 (void);

Warning

ibus_get_daemon_uid is deprecated and should not be used in newly-written code. This function has been deprecated and should @@ -367,7 +367,7 @@


ibus_get_socket_path ()

-
const gchar *       ibus_get_socket_path                (void);
+
const gchar *       ibus_get_socket_path                (void);

Get the path of socket file.

@@ -383,7 +383,7 @@

ibus_keyval_name ()

-
const gchar *       ibus_keyval_name                    (guint keyval);
+
const gchar *       ibus_keyval_name                    (guint keyval);

Return the name of a key symbol.

@@ -400,7 +400,7 @@

Returns :

-Corresponding key name. NULL if no such key symbol. +Corresponding key name. NULL if no such key symbol. @@ -409,7 +409,7 @@

ibus_keyval_from_name ()

-
guint               ibus_keyval_from_name               (const gchar *keyval_name);
+
guint               ibus_keyval_from_name               (const gchar *keyval_name);

Return the key symbol that associate with the key name.

@@ -432,7 +432,7 @@

ibus_free_strv ()

-
void                ibus_free_strv                      (gchar **strv);
+
void                ibus_free_strv                      (gchar **strv);

Warning

ibus_free_strv is deprecated and should not be used in newly-written code. This function has been deprecated and should @@ -453,8 +453,8 @@


ibus_key_event_to_string ()

-
const gchar *       ibus_key_event_to_string            (guint keyval,
-                                                         guint modifiers);
+
const gchar *       ibus_key_event_to_string            (guint keyval,
+                                                         guint modifiers);

Return the name of a key symbol and modifiers.

@@ -486,9 +486,9 @@

ibus_key_event_from_string ()

-
gboolean            ibus_key_event_from_string          (const gchar *string,
-                                                         guint *keyval,
-                                                         guint *modifiers);
+
gboolean            ibus_key_event_from_string          (const gchar *string,
+                                                         guint *keyval,
+                                                         guint *modifiers);

Parse key event string and return key symbol and modifiers.

@@ -526,7 +526,7 @@ Init the ibus types.

-It is actually a wrapper of g_type_init(). +It is actually a wrapper of g_type_init().


diff -Nru ibus-1.3.7/docs/reference/ibus/html/ibus-ibustypes.html ibus-1.3.8/docs/reference/ibus/html/ibus-ibustypes.html --- ibus-1.3.7/docs/reference/ibus/html/ibus-ibustypes.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ibus-ibustypes.html 2010-10-22 06:16:35.000000000 +0000 @@ -45,7 +45,7 @@ enum IBusPreeditFocusMode; enum IBusOrientation; IBusRectangle; -void (*IBusFreeFunc) (gpointer object); +void (*IBusFreeFunc) (gpointer object);
@@ -337,22 +337,22 @@ -

gint x;

+

gint x;

x coordinate. -

gint y;

+

gint y;

y coordinate. -

gint width;

+

gint width;

width of the rectangle. -

gint height;

+

gint height;

height of the renctangl. @@ -362,7 +362,7 @@

IBusFreeFunc ()

-
void                (*IBusFreeFunc)                     (gpointer object);
+
void                (*IBusFreeFunc)                     (gpointer object);

Free function prototype.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/ibus-ibusversion.html ibus-1.3.8/docs/reference/ibus/html/ibus-ibusversion.html --- ibus-1.3.7/docs/reference/ibus/html/ibus-ibusversion.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ibus-ibusversion.html 2010-10-22 06:16:35.000000000 +0000 @@ -77,7 +77,7 @@

IBUS_MICRO_VERSION

-
#define IBUS_MICRO_VERSION				(7)
+
#define IBUS_MICRO_VERSION				(8)
 

IBus micro version. diff -Nru ibus-1.3.7/docs/reference/ibus/html/ibus-ibusxml.html ibus-1.3.8/docs/reference/ibus/html/ibus-ibusxml.html --- ibus-1.3.7/docs/reference/ibus/html/ibus-ibusxml.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/ibus-ibusxml.html 2010-10-22 06:16:35.000000000 +0000 @@ -42,11 +42,11 @@

Synopsis

                    XMLNode;
-XMLNode *           ibus_xml_parse_file                 (const gchar *name);
-XMLNode *           ibus_xml_parse_buffer               (const gchar *buffer);
+XMLNode *           ibus_xml_parse_file                 (const gchar *name);
+XMLNode *           ibus_xml_parse_buffer               (const gchar *buffer);
 void                ibus_xml_free                       (XMLNode *node);
 void                ibus_xml_output                     (const XMLNode *node,
-                                                         GString *output);
+                                                         GString *output);
 
@@ -73,22 +73,22 @@ -

gchar *name;

+

gchar *name;

Name of XML tag. -

gchar *text;

+

gchar *text;

Text enclosed by XML start tag and end tag. i.e. text. -

gchar **attributes;

+

gchar **attributes;

Attributes of the XML node. -

GList *sub_nodes;

+

GList *sub_nodes;

Children node of this XML node. @@ -98,7 +98,7 @@

ibus_xml_parse_file ()

-
XMLNode *           ibus_xml_parse_file                 (const gchar *name);
+
XMLNode *           ibus_xml_parse_file                 (const gchar *name);

Parse an XML file and return a corresponding XML tree.

@@ -121,7 +121,7 @@

ibus_xml_parse_buffer ()

-
XMLNode *           ibus_xml_parse_buffer               (const gchar *buffer);
+
XMLNode *           ibus_xml_parse_buffer               (const gchar *buffer);

Parse a string buffer which contains an XML-formatted string, and return a corresponding XML tree. @@ -162,7 +162,7 @@

ibus_xml_output ()

void                ibus_xml_output                     (const XMLNode *node,
-                                                         GString *output);
+ GString *output);

Output an XML tree to a GString.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusInputContext.html ibus-1.3.8/docs/reference/ibus/html/IBusInputContext.html --- ibus-1.3.7/docs/reference/ibus/html/IBusInputContext.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusInputContext.html 2010-10-22 06:16:35.000000000 +0000 @@ -47,38 +47,38 @@

Synopsis

                    IBusInputContext;
                     IBusInputContextClass;
-gboolean            ibus_input_context_process_key_event
+gboolean            ibus_input_context_process_key_event
                                                         (IBusInputContext *context,
-                                                         guint32 keyval,
-                                                         guint32 keycode,
-                                                         guint32 state);
+                                                         guint32 keyval,
+                                                         guint32 keycode,
+                                                         guint32 state);
 void                ibus_input_context_set_cursor_location
                                                         (IBusInputContext *context,
-                                                         gint32 x,
-                                                         gint32 y,
-                                                         gint32 w,
-                                                         gint32 h);
+                                                         gint32 x,
+                                                         gint32 y,
+                                                         gint32 w,
+                                                         gint32 h);
 void                ibus_input_context_set_capabilities (IBusInputContext *context,
-                                                         guint32 capabilities);
+                                                         guint32 capabilities);
 void                ibus_input_context_property_activate
                                                         (IBusInputContext *context,
-                                                         const gchar *prop_name,
-                                                         gint32 state);
+                                                         const gchar *prop_name,
+                                                         gint32 state);
 void                ibus_input_context_focus_in         (IBusInputContext *context);
 void                ibus_input_context_focus_out        (IBusInputContext *context);
 void                ibus_input_context_reset            (IBusInputContext *context);
 void                ibus_input_context_enable           (IBusInputContext *context);
 void                ibus_input_context_disable          (IBusInputContext *context);
-gboolean            ibus_input_context_is_enabled       (IBusInputContext *context);
+gboolean            ibus_input_context_is_enabled       (IBusInputContext *context);
 void                ibus_input_context_set_engine       (IBusInputContext *context,
-                                                         const gchar *name);
+                                                         const gchar *name);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusProxy
                      +----IBusInputContext
@@ -144,11 +144,11 @@
 

ibus_input_context_process_key_event ()

-
gboolean            ibus_input_context_process_key_event
+
gboolean            ibus_input_context_process_key_event
                                                         (IBusInputContext *context,
-                                                         guint32 keyval,
-                                                         guint32 keycode,
-                                                         guint32 state);
+ guint32 keyval, + guint32 keycode, + guint32 state);

Pass the key event to input method engine.

@@ -211,10 +211,10 @@

ibus_input_context_set_cursor_location ()

void                ibus_input_context_set_cursor_location
                                                         (IBusInputContext *context,
-                                                         gint32 x,
-                                                         gint32 y,
-                                                         gint32 w,
-                                                         gint32 h);
+ gint32 x, + gint32 y, + gint32 w, + gint32 h);

Set the cursor location of IBus input context.

@@ -256,7 +256,7 @@

ibus_input_context_set_capabilities ()

void                ibus_input_context_set_capabilities (IBusInputContext *context,
-                                                         guint32 capabilities);
+ guint32 capabilities);

Set the capabilities flags of client application.

@@ -284,8 +284,8 @@

ibus_input_context_property_activate ()

void                ibus_input_context_property_activate
                                                         (IBusInputContext *context,
-                                                         const gchar *prop_name,
-                                                         gint32 state);
+ const gchar *prop_name, + gint32 state);

Activate the property.

@@ -411,7 +411,7 @@

ibus_input_context_is_enabled ()

-
gboolean            ibus_input_context_is_enabled       (IBusInputContext *context);
+
gboolean            ibus_input_context_is_enabled       (IBusInputContext *context);

Returns TRUE if the IME is enabled on the context.

@@ -435,7 +435,7 @@

ibus_input_context_set_engine ()

void                ibus_input_context_set_engine       (IBusInputContext *context,
-                                                         const gchar *name);
+ const gchar *name);

Invoked when the IME engine is changed.

@@ -462,13 +462,13 @@

The "commit-text" signal

void                user_function                      (IBusInputContext *context,
                                                         IBusText         *text,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the text is going to be committed.

(Note: The text object is floating, and it will be released after the signal. - If singal handler want to keep the object, the handler should use g_object_ref_sink() + If singal handler want to keep the object, the handler should use g_object_ref_sink() to get the ownership of the object.)

@@ -495,7 +495,7 @@

The "cursor-down-lookup-table" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to select next candidate of lookup table.

@@ -518,7 +518,7 @@

The "cursor-up-lookup-table" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to select previous candidate of lookup table.

@@ -541,9 +541,9 @@

The "delete-surrounding-text" signal

void                user_function                      (IBusInputContext *context,
-                                                        gint              offset,
-                                                        guint             n_chars,
-                                                        gpointer          user_data)      : Run Last
+ gint offset, + guint n_chars, + gpointer user_data) : Run Last

Emitted to delete surrounding text event from IME to client of IME.

@@ -577,7 +577,7 @@

The "disabled" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when an IME is disabled.

@@ -600,7 +600,7 @@

The "enabled" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when an IME is enabled.

@@ -623,10 +623,10 @@

The "forward-key-event" signal

void                user_function                      (IBusInputContext *context,
-                                                        guint             keyval,
-                                                        guint             keycode,
-                                                        guint             modifiers,
-                                                        gpointer          user_data)      : Run Last
+ guint keyval, + guint keycode, + guint modifiers, + gpointer user_data) : Run Last

Emitted to forward key event from IME to client of IME.

@@ -664,7 +664,7 @@

The "hide-auxiliary-text" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to hide auxiliary text.

@@ -687,7 +687,7 @@

The "hide-lookup-table" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to hide lookup table.

@@ -710,7 +710,7 @@

The "hide-preedit-text" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to hide preedit text.

@@ -733,7 +733,7 @@

The "page-down-lookup-table" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to view the next page of lookup table.

@@ -756,7 +756,7 @@

The "page-up-lookup-table" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to view the previous page of lookup table.

@@ -780,13 +780,13 @@

The "register-properties" signal

void                user_function                      (IBusInputContext *context,
                                                         IBusPropList     *props,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to register the properties in props.

(Note: The props object is floating, and it will be released after the signal. - If singal handler want to keep the object, the handler should use g_object_ref_sink() + If singal handler want to keep the object, the handler should use g_object_ref_sink() to get the ownership of the object.)

@@ -813,7 +813,7 @@

The "show-auxiliary-text" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to show auxiliary text.

@@ -836,7 +836,7 @@

The "show-lookup-table" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to show lookup table.

@@ -859,7 +859,7 @@

The "show-preedit-text" signal

void                user_function                      (IBusInputContext *context,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to show preedit text.

@@ -883,14 +883,14 @@

The "update-auxiliary-text" signal

void                user_function                      (IBusInputContext *context,
                                                         IBusText         *arg1,
-                                                        gboolean          arg2,
-                                                        gpointer          user_data)      : Run Last
+ gboolean arg2, + gpointer user_data) : Run Last

Emitted to hide auxilary text.

(Note: The text object is floating, and it will be released after the signal. - If singal handler want to keep the object, the handler should use g_object_ref_sink() + If singal handler want to keep the object, the handler should use g_object_ref_sink() to get the ownership of the object.)

@@ -913,14 +913,14 @@

The "update-lookup-table" signal

void                user_function                      (IBusInputContext *context,
                                                         IBusLookupTable  *table,
-                                                        gboolean          visible,
-                                                        gpointer          user_data)      : Run Last
+ gboolean visible, + gpointer user_data) : Run Last

Emitted to update lookup table.

(Note: The table object is floating, and it will be released after the signal. - If singal handler want to keep the object, the handler should use g_object_ref_sink() + If singal handler want to keep the object, the handler should use g_object_ref_sink() to get the ownership of the object.)

@@ -953,15 +953,15 @@

The "update-preedit-text" signal

void                user_function                      (IBusInputContext *context,
                                                         IBusText         *text,
-                                                        guint             cursor_pos,
-                                                        gboolean          visible,
-                                                        gpointer          user_data)       : Run Last
+ guint cursor_pos, + gboolean visible, + gpointer user_data) : Run Last

Emitted to update preedit text.

(Note: The text object is floating, and it will be released after the signal. - If singal handler want to keep the object, the handler should use g_object_ref_sink() + If singal handler want to keep the object, the handler should use g_object_ref_sink() to get the ownership of the object.)

@@ -999,13 +999,13 @@

The "update-property" signal

void                user_function                      (IBusInputContext *context,
                                                         IBusProperty     *prop,
-                                                        gpointer          user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted to update the property prop.

(Note: The prop object is floating, and it will be released after the signal. - If singal handler want to keep the object, the handler should use g_object_ref_sink() + If singal handler want to keep the object, the handler should use g_object_ref_sink() to get the ownership of the object.)

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusKeymap.html ibus-1.3.8/docs/reference/ibus/html/IBusKeymap.html --- ibus-1.3.7/docs/reference/ibus/html/IBusKeymap.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusKeymap.html 2010-10-22 06:16:35.000000000 +0000 @@ -45,18 +45,18 @@

Synopsis

                    IBusKeymap;
                     IBusKeymapClass;
-IBusKeymap *        ibus_keymap_new                     (const gchar *name);
-IBusKeymap *        ibus_keymap_get                     (const gchar *name);
-guint               ibus_keymap_lookup_keysym           (IBusKeymap *keymap,
-                                                         guint16 keycode,
-                                                         guint32 state);
+IBusKeymap *        ibus_keymap_new                     (const gchar *name);
+IBusKeymap *        ibus_keymap_get                     (const gchar *name);
+guint               ibus_keymap_lookup_keysym           (IBusKeymap *keymap,
+                                                         guint16 keycode,
+                                                         guint32 state);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusKeymap
 
@@ -96,12 +96,12 @@
- + - + @@ -121,7 +121,7 @@

ibus_keymap_new ()

-
IBusKeymap *        ibus_keymap_new                     (const gchar *name);
+
IBusKeymap *        ibus_keymap_new                     (const gchar *name);

Warning

ibus_keymap_new is deprecated and should not be used in newly-written code. This function has been deprecated and should @@ -153,7 +153,7 @@


ibus_keymap_get ()

-
IBusKeymap *        ibus_keymap_get                     (const gchar *name);
+
IBusKeymap *        ibus_keymap_get                     (const gchar *name);

Get an IBusKeymap associated with the giving name.

@@ -180,9 +180,9 @@

ibus_keymap_lookup_keysym ()

-
guint               ibus_keymap_lookup_keysym           (IBusKeymap *keymap,
-                                                         guint16 keycode,
-                                                         guint32 state);
+
guint               ibus_keymap_lookup_keysym           (IBusKeymap *keymap,
+                                                         guint16 keycode,
+                                                         guint32 state);

Convert the scancode to keysym, given the keymap.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusLookupTable.html ibus-1.3.8/docs/reference/ibus/html/IBusLookupTable.html --- ibus-1.3.7/docs/reference/ibus/html/IBusLookupTable.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusLookupTable.html 2010-10-22 06:16:35.000000000 +0000 @@ -45,53 +45,53 @@

Synopsis

                    IBusLookupTable;
                     IBusLookupTableClass;
-IBusLookupTable *   ibus_lookup_table_new               (guint page_size,
-                                                         guint cursor_pos,
-                                                         gboolean cursor_visible,
-                                                         gboolean round);
+IBusLookupTable *   ibus_lookup_table_new               (guint page_size,
+                                                         guint cursor_pos,
+                                                         gboolean cursor_visible,
+                                                         gboolean round);
 void                ibus_lookup_table_append_candidate  (IBusLookupTable *table,
                                                          IBusText *text);
-guint               ibus_lookup_table_get_number_of_candidates
+guint               ibus_lookup_table_get_number_of_candidates
                                                         (IBusLookupTable *table);
 IBusText *          ibus_lookup_table_get_candidate     (IBusLookupTable *table,
-                                                         guint index);
+                                                         guint index);
 void                ibus_lookup_table_append_label      (IBusLookupTable *table,
                                                          IBusText *text);
 void                ibus_lookup_table_set_label         (IBusLookupTable *table,
-                                                         guint index,
+                                                         guint index,
                                                          IBusText *text);
 IBusText *          ibus_lookup_table_get_label         (IBusLookupTable *table,
-                                                         guint index);
+                                                         guint index);
 void                ibus_lookup_table_set_cursor_pos    (IBusLookupTable *table,
-                                                         guint cursor_pos);
-guint               ibus_lookup_table_get_cursor_pos    (IBusLookupTable *table);
+                                                         guint cursor_pos);
+guint               ibus_lookup_table_get_cursor_pos    (IBusLookupTable *table);
 void                ibus_lookup_table_set_cursor_visible
                                                         (IBusLookupTable *table,
-                                                         gboolean visible);
-gboolean            ibus_lookup_table_is_cursor_visible (IBusLookupTable *table);
-guint               ibus_lookup_table_get_cursor_in_page
+                                                         gboolean visible);
+gboolean            ibus_lookup_table_is_cursor_visible (IBusLookupTable *table);
+guint               ibus_lookup_table_get_cursor_in_page
                                                         (IBusLookupTable *table);
 void                ibus_lookup_table_set_page_size     (IBusLookupTable *table,
-                                                         guint page_size);
-guint               ibus_lookup_table_get_page_size     (IBusLookupTable *table);
+                                                         guint page_size);
+guint               ibus_lookup_table_get_page_size     (IBusLookupTable *table);
 void                ibus_lookup_table_set_round         (IBusLookupTable *table,
-                                                         gboolean round);
-gboolean            ibus_lookup_table_is_round          (IBusLookupTable *table);
+                                                         gboolean round);
+gboolean            ibus_lookup_table_is_round          (IBusLookupTable *table);
 void                ibus_lookup_table_set_orientation   (IBusLookupTable *table,
-                                                         gint orientation);
-gint                ibus_lookup_table_get_orientation   (IBusLookupTable *table);
+                                                         gint orientation);
+gint                ibus_lookup_table_get_orientation   (IBusLookupTable *table);
 void                ibus_lookup_table_clear             (IBusLookupTable *table);
-gboolean            ibus_lookup_table_page_up           (IBusLookupTable *table);
-gboolean            ibus_lookup_table_page_down         (IBusLookupTable *table);
-gboolean            ibus_lookup_table_cursor_up         (IBusLookupTable *table);
-gboolean            ibus_lookup_table_cursor_down       (IBusLookupTable *table);
+gboolean            ibus_lookup_table_page_up           (IBusLookupTable *table);
+gboolean            ibus_lookup_table_page_down         (IBusLookupTable *table);
+gboolean            ibus_lookup_table_cursor_up         (IBusLookupTable *table);
+gboolean            ibus_lookup_table_cursor_down       (IBusLookupTable *table);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusLookupTable
@@ -134,37 +134,37 @@
 
- + - + - + - + - + - + - + @@ -184,10 +184,10 @@

ibus_lookup_table_new ()

-
IBusLookupTable *   ibus_lookup_table_new               (guint page_size,
-                                                         guint cursor_pos,
-                                                         gboolean cursor_visible,
-                                                         gboolean round);
+
IBusLookupTable *   ibus_lookup_table_new               (guint page_size,
+                                                         guint cursor_pos,
+                                                         gboolean cursor_visible,
+                                                         gboolean round);

New a IBusLookupTable.

@@ -249,7 +249,7 @@

ibus_lookup_table_get_number_of_candidates ()

-
guint               ibus_lookup_table_get_number_of_candidates
+
guint               ibus_lookup_table_get_number_of_candidates
                                                         (IBusLookupTable *table);

Return the number of candidate in the table. @@ -274,7 +274,7 @@

ibus_lookup_table_get_candidate ()

IBusText *          ibus_lookup_table_get_candidate     (IBusLookupTable *table,
-                                                         guint index);
+ guint index);

Return IBusText at the given index. Borrowed reference.

@@ -329,7 +329,7 @@

ibus_lookup_table_set_label ()

void                ibus_lookup_table_set_label         (IBusLookupTable *table,
-                                                         guint index,
+                                                         guint index,
                                                          IBusText *text);

Append a candidate word/phrase to IBusLookupTable, and increase reference. @@ -361,7 +361,7 @@

ibus_lookup_table_get_label ()

IBusText *          ibus_lookup_table_get_label         (IBusLookupTable *table,
-                                                         guint index);
+ guint index);

Return IBusText at the given index. Borrowed reference.

@@ -390,7 +390,7 @@

ibus_lookup_table_set_cursor_pos ()

void                ibus_lookup_table_set_cursor_pos    (IBusLookupTable *table,
-                                                         guint cursor_pos);
+ guint cursor_pos);

Set the cursor position of IBusLookupTable.

@@ -413,7 +413,7 @@

ibus_lookup_table_get_cursor_pos ()

-
guint               ibus_lookup_table_get_cursor_pos    (IBusLookupTable *table);
+
guint               ibus_lookup_table_get_cursor_pos    (IBusLookupTable *table);

Get the cursor position of IBusLookupTable.

@@ -438,7 +438,7 @@

ibus_lookup_table_set_cursor_visible ()

void                ibus_lookup_table_set_cursor_visible
                                                         (IBusLookupTable *table,
-                                                         gboolean visible);
+ gboolean visible);

Set whether to make the cursor of an IBusLookupTable visible or not.

@@ -461,7 +461,7 @@

ibus_lookup_table_is_cursor_visible ()

-
gboolean            ibus_lookup_table_is_cursor_visible (IBusLookupTable *table);
+
gboolean            ibus_lookup_table_is_cursor_visible (IBusLookupTable *table);

Returns whether the cursor of an IBusLookupTable is visible.

@@ -484,7 +484,7 @@

ibus_lookup_table_get_cursor_in_page ()

-
guint               ibus_lookup_table_get_cursor_in_page
+
guint               ibus_lookup_table_get_cursor_in_page
                                                         (IBusLookupTable *table);

Get the cursor position in current page of IBusLookupTable. @@ -509,7 +509,7 @@

ibus_lookup_table_set_page_size ()

void                ibus_lookup_table_set_page_size     (IBusLookupTable *table,
-                                                         guint page_size);
+ guint page_size);

Set the number of candidate shown per page.

@@ -532,7 +532,7 @@

ibus_lookup_table_get_page_size ()

-
guint               ibus_lookup_table_get_page_size     (IBusLookupTable *table);
+
guint               ibus_lookup_table_get_page_size     (IBusLookupTable *table);

Get the number of candidate shown per page.

@@ -556,7 +556,7 @@

ibus_lookup_table_set_round ()

void                ibus_lookup_table_set_round         (IBusLookupTable *table,
-                                                         gboolean round);
+ gboolean round);

Set whether to make the IBusLookupTable round or not.

@@ -579,7 +579,7 @@

ibus_lookup_table_is_round ()

-
gboolean            ibus_lookup_table_is_round          (IBusLookupTable *table);
+
gboolean            ibus_lookup_table_is_round          (IBusLookupTable *table);

Returns whether the IBusLookupTable is round.

@@ -603,7 +603,7 @@

ibus_lookup_table_set_orientation ()

void                ibus_lookup_table_set_orientation   (IBusLookupTable *table,
-                                                         gint orientation);
+ gint orientation);

Set the orientation.

@@ -626,7 +626,7 @@

ibus_lookup_table_get_orientation ()

-
gint                ibus_lookup_table_get_orientation   (IBusLookupTable *table);
+
gint                ibus_lookup_table_get_orientation   (IBusLookupTable *table);

Returns the orientation of the IBusLookupTable.

@@ -665,7 +665,7 @@

ibus_lookup_table_page_up ()

-
gboolean            ibus_lookup_table_page_up           (IBusLookupTable *table);
+
gboolean            ibus_lookup_table_page_up           (IBusLookupTable *table);

Go to previous page of an IBusLookupTable.

@@ -693,7 +693,7 @@

ibus_lookup_table_page_down ()

-
gboolean            ibus_lookup_table_page_down         (IBusLookupTable *table);
+
gboolean            ibus_lookup_table_page_down         (IBusLookupTable *table);

Go to next page of an IBusLookupTable.

@@ -721,7 +721,7 @@

ibus_lookup_table_cursor_up ()

-
gboolean            ibus_lookup_table_cursor_up         (IBusLookupTable *table);
+
gboolean            ibus_lookup_table_cursor_up         (IBusLookupTable *table);

Go to previous candidate of an IBusLookupTable.

@@ -749,7 +749,7 @@

ibus_lookup_table_cursor_down ()

-
gboolean            ibus_lookup_table_cursor_down       (IBusLookupTable *table);
+
gboolean            ibus_lookup_table_cursor_down       (IBusLookupTable *table);

Go to next candidate of an IBusLookupTable.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusObject.html ibus-1.3.8/docs/reference/ibus/html/IBusObject.html --- ibus-1.3.7/docs/reference/ibus/html/IBusObject.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusObject.html 2010-10-22 06:16:35.000000000 +0000 @@ -55,8 +55,8 @@

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusConnection
                +----IBusSerializable
@@ -162,7 +162,7 @@
 

The "destroy" signal

void                user_function                      (IBusObject *object,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Destroy and free an IBusObject

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusObservedPath.html ibus-1.3.8/docs/reference/ibus/html/IBusObservedPath.html --- ibus-1.3.7/docs/reference/ibus/html/IBusObservedPath.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusObservedPath.html 2010-10-22 06:16:35.000000000 +0000 @@ -47,22 +47,22 @@ IBusObservedPathClass; IBusObservedPath * ibus_observed_path_new_from_xml_node (XMLNode *node, - gboolean fill_stat); -IBusObservedPath * ibus_observed_path_new (const gchar *path, - gboolean fill_stat); -GList * ibus_observed_path_traverse (IBusObservedPath *path); -gboolean ibus_observed_path_check_modification + gboolean fill_stat); +IBusObservedPath * ibus_observed_path_new (const gchar *path, + gboolean fill_stat); +GList * ibus_observed_path_traverse (IBusObservedPath *path); +gboolean ibus_observed_path_check_modification (IBusObservedPath *path); void ibus_observed_path_output (IBusObservedPath *path, - GString *output, - gint indent); + GString *output, + gint indent);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusObservedPath
@@ -105,7 +105,7 @@
 

ibus_observed_path_new_from_xml_node ()

IBusObservedPath *  ibus_observed_path_new_from_xml_node
                                                         (XMLNode *node,
-                                                         gboolean fill_stat);
+ gboolean fill_stat);

New an IBusObservedPath from an XML node.

@@ -133,8 +133,8 @@

ibus_observed_path_new ()

-
IBusObservedPath *  ibus_observed_path_new              (const gchar *path,
-                                                         gboolean fill_stat);
+
IBusObservedPath *  ibus_observed_path_new              (const gchar *path,
+                                                         gboolean fill_stat);

New an IBusObservedPath from an XML node.

@@ -162,7 +162,7 @@

ibus_observed_path_traverse ()

-
GList *             ibus_observed_path_traverse         (IBusObservedPath *path);
+
GList *             ibus_observed_path_traverse         (IBusObservedPath *path);

Recursively traverse the path and put the files and subdirectory in to a newly allocated GLists, if the path is a directory. Otherwise returns NULL. @@ -186,7 +186,7 @@


ibus_observed_path_check_modification ()

-
gboolean            ibus_observed_path_check_modification
+
gboolean            ibus_observed_path_check_modification
                                                         (IBusObservedPath *path);

Checks whether the path is modified by comparing the mtime in object and mtime in file system. @@ -212,8 +212,8 @@

ibus_observed_path_output ()

void                ibus_observed_path_output           (IBusObservedPath *path,
-                                                         GString *output,
-                                                         gint indent);
+ GString *output, + gint indent);

Append the observed path to a string with following format: <path mtime="<i>modified time</i>" ><i>path</i></path> diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusPanelService.html ibus-1.3.8/docs/reference/ibus/html/IBusPanelService.html --- ibus-1.3.7/docs/reference/ibus/html/IBusPanelService.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusPanelService.html 2010-10-22 06:16:35.000000000 +0000 @@ -50,27 +50,27 @@ IBusPanelService * ibus_panel_service_new (IBusConnection *connection); void ibus_panel_service_candidate_clicked (IBusPanelService *panel, - guint index, - guint button, - guint state); + guint index, + guint button, + guint state); void ibus_panel_service_cursor_down (IBusPanelService *panel); void ibus_panel_service_cursor_up (IBusPanelService *panel); void ibus_panel_service_page_down (IBusPanelService *panel); void ibus_panel_service_page_up (IBusPanelService *panel); void ibus_panel_service_property_active (IBusPanelService *panel, - const gchar *prop_name, + const gchar *prop_name, int prop_state); void ibus_panel_service_property_show (IBusPanelService *panel, - const gchar *prop_name); + const gchar *prop_name); void ibus_panel_service_property_hide (IBusPanelService *panel, - const gchar *prop_name); + const gchar *prop_name);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusService
                      +----IBusPanelService
@@ -201,9 +201,9 @@
 

ibus_panel_service_candidate_clicked ()

void                ibus_panel_service_candidate_clicked
                                                         (IBusPanelService *panel,
-                                                         guint index,
-                                                         guint button,
-                                                         guint state);
+ guint index, + guint button, + guint state);

Notify that a candidate is clicked by sending a "CandidateClicked" to IBus service. @@ -306,7 +306,7 @@

ibus_panel_service_property_active ()

void                ibus_panel_service_property_active  (IBusPanelService *panel,
-                                                         const gchar *prop_name,
+                                                         const gchar *prop_name,
                                                          int prop_state);

Notify that a property is active @@ -337,7 +337,7 @@

ibus_panel_service_property_show ()

void                ibus_panel_service_property_show    (IBusPanelService *panel,
-                                                         const gchar *prop_name);
+ const gchar *prop_name);

Notify that a property is shown by sending a "ValueChanged" message to IBus service. @@ -362,7 +362,7 @@

ibus_panel_service_property_hide ()

void                ibus_panel_service_property_hide    (IBusPanelService *panel,
-                                                         const gchar *prop_name);
+ const gchar *prop_name);

Notify that a property is hidden by sending a "ValueChanged" message to IBus service. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusProperty.html ibus-1.3.8/docs/reference/ibus/html/IBusProperty.html --- ibus-1.3.7/docs/reference/ibus/html/IBusProperty.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusProperty.html 2010-10-22 06:16:35.000000000 +0000 @@ -49,45 +49,45 @@ IBusPropertyClass; IBusPropList; IBusPropListClass; -IBusProperty * ibus_property_new (const gchar *key, +IBusProperty * ibus_property_new (const gchar *key, IBusPropType type, IBusText *label, - const gchar *icon, + const gchar *icon, IBusText *tooltip, - gboolean sensitive, - gboolean visible, + gboolean sensitive, + gboolean visible, IBusPropState state, IBusPropList *prop_list); void ibus_property_set_label (IBusProperty *prop, IBusText *label); void ibus_property_set_icon (IBusProperty *prop, - const gchar *icon); + const gchar *icon); void ibus_property_set_tooltip (IBusProperty *prop, IBusText *tooltip); void ibus_property_set_sensitive (IBusProperty *prop, - gboolean sensitive); + gboolean sensitive); void ibus_property_set_visible (IBusProperty *prop, - gboolean visible); + gboolean visible); void ibus_property_set_state (IBusProperty *prop, IBusPropState state); void ibus_property_set_sub_props (IBusProperty *prop, IBusPropList *prop_list); -gboolean ibus_property_update (IBusProperty *prop, +gboolean ibus_property_update (IBusProperty *prop, IBusProperty *prop_update);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusProperty
 
-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusPropList
@@ -231,12 +231,12 @@
 
- + - + @@ -251,22 +251,22 @@ - + - + - + - + @@ -313,13 +313,13 @@

ibus_property_new ()

-
IBusProperty *      ibus_property_new                   (const gchar *key,
+
IBusProperty *      ibus_property_new                   (const gchar *key,
                                                          IBusPropType type,
                                                          IBusText *label,
-                                                         const gchar *icon,
+                                                         const gchar *icon,
                                                          IBusText *tooltip,
-                                                         gboolean sensitive,
-                                                         gboolean visible,
+                                                         gboolean sensitive,
+                                                         gboolean visible,
                                                          IBusPropState state,
                                                          IBusPropList *prop_list);

@@ -409,7 +409,7 @@

ibus_property_set_icon ()

void                ibus_property_set_icon              (IBusProperty *prop,
-                                                         const gchar *icon);
+ const gchar *icon);

Set the icon of IBusProperty.

@@ -457,7 +457,7 @@

ibus_property_set_sensitive ()

void                ibus_property_set_sensitive         (IBusProperty *prop,
-                                                         gboolean sensitive);
+ gboolean sensitive);

Set whether the IBusProperty is sensitive.

@@ -481,7 +481,7 @@

ibus_property_set_visible ()

void                ibus_property_set_visible           (IBusProperty *prop,
-                                                         gboolean visible);
+ gboolean visible);

Set whether the IBusProperty is visible.

@@ -552,7 +552,7 @@

ibus_property_update ()

-
gboolean            ibus_property_update                (IBusProperty *prop,
+
gboolean            ibus_property_update                (IBusProperty *prop,
                                                          IBusProperty *prop_update);

Update the content of an IBusProperty. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusPropList.html ibus-1.3.8/docs/reference/ibus/html/IBusPropList.html --- ibus-1.3.7/docs/reference/ibus/html/IBusPropList.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusPropList.html 2010-10-22 06:16:35.000000000 +0000 @@ -49,16 +49,16 @@ void ibus_prop_list_append (IBusPropList *prop_list, IBusProperty *prop); IBusProperty * ibus_prop_list_get (IBusPropList *prop_list, - guint index); -gboolean ibus_prop_list_update_property (IBusPropList *prop_list, + guint index); +gboolean ibus_prop_list_update_property (IBusPropList *prop_list, IBusProperty *prop);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusPropList
@@ -84,7 +84,7 @@
 

gchar *name;

gchar *name;

The name of the keymap, such as 'us', 'jp'.

guint keymap[256][7];

guint keymap[256][7];

Keymap table. IME developers normally don have to touch this.

guint page_size;

guint page_size;

number of candidate shown per page.

guint cursor_pos;

guint cursor_pos;

position index of cursor.

gboolean cursor_visible;

gboolean cursor_visible;

whether the cursor is visible.

gboolean round;

gboolean round;

TRUE for lookup table wrap around.

gint orientation;

gint orientation;

orientation of the table.

GArray *candidates;

GArray *candidates;

Candidate words/phrases.

GArray *labels;

GArray *labels;

Candidate labels which identify individual candidates in the same page. Default is 1, 2, 3, 4 ...

gchar *key;

gchar *key;

Unique Identity for the IBusProperty.

gchar *icon;

gchar *icon;

Icon file for the IBusProperty.

gboolean sensitive;

gboolean sensitive;

Whether the IBusProperty is sensitive to keyboard and mouse event.

gboolean visible;

gboolean visible;

Whether the IBusProperty is visible.

guint type;

guint type;

IBusPropType of IBusProperty.

guint state;

guint state;

IBusPropState of IBusProperty.
- + @@ -144,7 +144,7 @@

ibus_prop_list_get ()

IBusProperty *      ibus_prop_list_get                  (IBusPropList *prop_list,
-                                                         guint index);
+ guint index);

Returns IBusProperty at given index. Borrowed reference.

@@ -172,7 +172,7 @@

ibus_prop_list_update_property ()

-
gboolean            ibus_prop_list_update_property      (IBusPropList *prop_list,
+
gboolean            ibus_prop_list_update_property      (IBusPropList *prop_list,
                                                          IBusProperty *prop);

Update an IBusProperty in IBusPropList. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusProxy.html ibus-1.3.8/docs/reference/ibus/html/IBusProxy.html --- ibus-1.3.7/docs/reference/ibus/html/IBusProxy.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusProxy.html 2010-10-22 06:16:35.000000000 +0000 @@ -49,50 +49,50 @@

Synopsis

                    IBusProxy;
                     IBusProxyClass;
-IBusProxy *         ibus_proxy_new                      (const gchar *name,
-                                                         const gchar *path,
+IBusProxy *         ibus_proxy_new                      (const gchar *name,
+                                                         const gchar *path,
                                                          IBusConnection *connection);
-gboolean            ibus_proxy_send                     (IBusProxy *proxy,
+gboolean            ibus_proxy_send                     (IBusProxy *proxy,
                                                          IBusMessage *message);
-gboolean            ibus_proxy_call                     (IBusProxy *proxy,
-                                                         const gchar *method,
-                                                         GType first_arg_type,
+gboolean            ibus_proxy_call                     (IBusProxy *proxy,
+                                                         const gchar *method,
+                                                         GType first_arg_type,
                                                          ...);
-gboolean            ibus_proxy_call_with_reply          (IBusProxy *proxy,
-                                                         const gchar *method,
+gboolean            ibus_proxy_call_with_reply          (IBusProxy *proxy,
+                                                         const gchar *method,
                                                          IBusPendingCall **pending,
-                                                         gint timeout_milliseconds,
+                                                         gint timeout_milliseconds,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);
 IBusMessage *       ibus_proxy_call_with_reply_and_block
                                                         (IBusProxy *proxy,
-                                                         const gchar *method,
-                                                         gint timeout_milliseconds,
+                                                         const gchar *method,
+                                                         gint timeout_milliseconds,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);
-gboolean            ibus_proxy_send_with_reply          (IBusProxy *proxy,
+gboolean            ibus_proxy_send_with_reply          (IBusProxy *proxy,
                                                          IBusMessage *message,
                                                          IBusPendingCall **pending,
-                                                         gint timeout_milliseconds);
+                                                         gint timeout_milliseconds);
 IBusMessage *       ibus_proxy_send_with_reply_and_block
                                                         (IBusProxy *proxy,
                                                          IBusMessage *message);
-gboolean            ibus_proxy_handle_signal            (IBusProxy *proxy,
+gboolean            ibus_proxy_handle_signal            (IBusProxy *proxy,
                                                          IBusMessage *message);
-const gchar *       ibus_proxy_get_name                 (IBusProxy *proxy);
-const gchar *       ibus_proxy_get_unique_name          (IBusProxy *proxy);
-const gchar *       ibus_proxy_get_path                 (IBusProxy *proxy);
-const gchar *       ibus_proxy_get_interface            (IBusProxy *proxy);
+const gchar *       ibus_proxy_get_name                 (IBusProxy *proxy);
+const gchar *       ibus_proxy_get_unique_name          (IBusProxy *proxy);
+const gchar *       ibus_proxy_get_path                 (IBusProxy *proxy);
+const gchar *       ibus_proxy_get_interface            (IBusProxy *proxy);
 IBusConnection *    ibus_proxy_get_connection           (IBusProxy *proxy);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusProxy
                      +----IBusConfig
@@ -103,9 +103,9 @@
 

Properties

   "connection"               IBusConnection*       : Read / Write / Construct Only
-  "interface"                gchar*                : Read / Write / Construct Only
-  "name"                     gchar*                : Read / Write / Construct Only
-  "path"                     gchar*                : Read / Write / Construct Only
+  "interface"                gchar*                : Read / Write / Construct Only
+  "name"                     gchar*                : Read / Write / Construct Only
+  "path"                     gchar*                : Read / Write / Construct Only
 
@@ -152,8 +152,8 @@

ibus_proxy_new ()

-
IBusProxy *         ibus_proxy_new                      (const gchar *name,
-                                                         const gchar *path,
+
IBusProxy *         ibus_proxy_new                      (const gchar *name,
+                                                         const gchar *path,
                                                          IBusConnection *connection);

New an IBusProxy instance. @@ -189,7 +189,7 @@


ibus_proxy_send ()

-
gboolean            ibus_proxy_send                     (IBusProxy *proxy,
+
gboolean            ibus_proxy_send                     (IBusProxy *proxy,
                                                          IBusMessage *message);

Send an IBusMessage to the corresponding service. @@ -221,9 +221,9 @@


ibus_proxy_call ()

-
gboolean            ibus_proxy_call                     (IBusProxy *proxy,
-                                                         const gchar *method,
-                                                         GType first_arg_type,
+
gboolean            ibus_proxy_call                     (IBusProxy *proxy,
+                                                         const gchar *method,
+                                                         GType first_arg_type,
                                                          ...);

Call a method of the corresponding service. @@ -265,12 +265,12 @@


ibus_proxy_call_with_reply ()

-
gboolean            ibus_proxy_call_with_reply          (IBusProxy *proxy,
-                                                         const gchar *method,
+
gboolean            ibus_proxy_call_with_reply          (IBusProxy *proxy,
+                                                         const gchar *method,
                                                          IBusPendingCall **pending,
-                                                         gint timeout_milliseconds,
+                                                         gint timeout_milliseconds,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);

Call a method of the corresponding service, and returns an IBusPendingCall used to receive a reply to the message. @@ -331,10 +331,10 @@

ibus_proxy_call_with_reply_and_block ()

IBusMessage *       ibus_proxy_call_with_reply_and_block
                                                         (IBusProxy *proxy,
-                                                         const gchar *method,
-                                                         gint timeout_milliseconds,
+                                                         const gchar *method,
+                                                         gint timeout_milliseconds,
                                                          IBusError **error,
-                                                         GType first_arg_type,
+                                                         GType first_arg_type,
                                                          ...);

Call a method of the corresponding service and blocks a certain time period while waiting for @@ -390,10 +390,10 @@


ibus_proxy_send_with_reply ()

-
gboolean            ibus_proxy_send_with_reply          (IBusProxy *proxy,
+
gboolean            ibus_proxy_send_with_reply          (IBusProxy *proxy,
                                                          IBusMessage *message,
                                                          IBusPendingCall **pending,
-                                                         gint timeout_milliseconds);
+ gint timeout_milliseconds);

Send an IBusMessage to the corresponding service and returns an IBusPendingCall used to receive a reply to the message. @@ -474,7 +474,7 @@


ibus_proxy_handle_signal ()

-
gboolean            ibus_proxy_handle_signal            (IBusProxy *proxy,
+
gboolean            ibus_proxy_handle_signal            (IBusProxy *proxy,
                                                          IBusMessage *message);

Handle a signal by emitting IBusProxy::ibus-signal. @@ -513,7 +513,7 @@


ibus_proxy_get_name ()

-
const gchar *       ibus_proxy_get_name                 (IBusProxy *proxy);
+
const gchar *       ibus_proxy_get_name                 (IBusProxy *proxy);

Get the service name of a proxy object.

@@ -536,7 +536,7 @@

ibus_proxy_get_unique_name ()

-
const gchar *       ibus_proxy_get_unique_name          (IBusProxy *proxy);
+
const gchar *       ibus_proxy_get_unique_name          (IBusProxy *proxy);

Get the unique name of the proxy object.

@@ -559,7 +559,7 @@

ibus_proxy_get_path ()

-
const gchar *       ibus_proxy_get_path                 (IBusProxy *proxy);
+
const gchar *       ibus_proxy_get_path                 (IBusProxy *proxy);

Get the path of a proxy object.

@@ -582,7 +582,7 @@

ibus_proxy_get_interface ()

-
const gchar *       ibus_proxy_get_interface            (IBusProxy *proxy);
+
const gchar *       ibus_proxy_get_interface            (IBusProxy *proxy);

Get interface of a proxy object.

@@ -638,7 +638,7 @@

The "interface" property

-
  "interface"                gchar*                : Read / Write / Construct Only
+
  "interface"                gchar*                : Read / Write / Construct Only

The interface of the proxy object.

@@ -647,7 +647,7 @@

The "name" property

-
  "name"                     gchar*                : Read / Write / Construct Only
+
  "name"                     gchar*                : Read / Write / Construct Only

The service name of the proxy object.

@@ -656,7 +656,7 @@

The "path" property

-
  "path"                     gchar*                : Read / Write / Construct Only
+
  "path"                     gchar*                : Read / Write / Construct Only

The path of the proxy object.

@@ -667,9 +667,9 @@

Signal Details

The "ibus-signal" signal

-
gboolean            user_function                      (IBusProxy *proxy,
-                                                        gpointer   message,
-                                                        gpointer   user_data)      : Run Last
+
gboolean            user_function                      (IBusProxy *proxy,
+                                                        gpointer   message,
+                                                        gpointer   user_data)      : Run Last

Emitted when sending a signal. Implement the member function ibus_signal() in extended class to receive this signal. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusSerializable.html ibus-1.3.8/docs/reference/ibus/html/IBusSerializable.html --- ibus-1.3.7/docs/reference/ibus/html/IBusSerializable.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusSerializable.html 2010-10-22 06:16:35.000000000 +0000 @@ -53,23 +53,23 @@ k) IBusSerializable; IBusSerializableClass; -gboolean (*IBusSerializableSerializeFunc) (IBusSerializable *object, +gboolean (*IBusSerializableSerializeFunc) (IBusSerializable *object, IBusMessageIter *iter); -gboolean (*IBusSerializableDeserializeFunc) (IBusSerializable *object, +gboolean (*IBusSerializableDeserializeFunc) (IBusSerializable *object, IBusMessageIter *iter); -gboolean (*IBusSerializableCopyFunc) (IBusSerializable *dest, +gboolean (*IBusSerializableCopyFunc) (IBusSerializable *dest, const IBusSerializable *src); IBusSerializable * ibus_serializable_new (void); -gboolean ibus_serializable_set_qattachment (IBusSerializable *object, - GQuark key, - const GValue *value); -const GValue * ibus_serializable_get_qattachment (IBusSerializable *object, - GQuark key); +gboolean ibus_serializable_set_qattachment (IBusSerializable *object, + GQuark key, + const GValue *value); +const GValue * ibus_serializable_get_qattachment (IBusSerializable *object, + GQuark key); void ibus_serializable_remove_qattachment (IBusSerializable *object, - GQuark key); + GQuark key); IBusSerializable * ibus_serializable_copy (IBusSerializable *object); -gboolean ibus_serializable_serialize (IBusSerializable *object, +gboolean ibus_serializable_serialize (IBusSerializable *object, IBusMessageIter *iter); IBusSerializable * ibus_serializable_deserialize (IBusMessageIter *iter);

@@ -77,8 +77,8 @@

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusHotkeyProfile
@@ -229,7 +229,7 @@
 

IBusSerializableSerializeFunc ()

-
gboolean            (*IBusSerializableSerializeFunc)    (IBusSerializable *object,
+
gboolean            (*IBusSerializableSerializeFunc)    (IBusSerializable *object,
                                                          IBusMessageIter *iter);

Prototype of serialize function. @@ -261,7 +261,7 @@


IBusSerializableDeserializeFunc ()

-
gboolean            (*IBusSerializableDeserializeFunc)  (IBusSerializable *object,
+
gboolean            (*IBusSerializableDeserializeFunc)  (IBusSerializable *object,
                                                          IBusMessageIter *iter);

Prototype of deserialize function. @@ -292,7 +292,7 @@


IBusSerializableCopyFunc ()

-
gboolean            (*IBusSerializableCopyFunc)         (IBusSerializable *dest,
+
gboolean            (*IBusSerializableCopyFunc)         (IBusSerializable *dest,
                                                          const IBusSerializable *src);

Prototype of copy function. @@ -339,9 +339,9 @@


ibus_serializable_set_qattachment ()

-
gboolean            ibus_serializable_set_qattachment   (IBusSerializable *object,
-                                                         GQuark key,
-                                                         const GValue *value);
+
gboolean            ibus_serializable_set_qattachment   (IBusSerializable *object,
+                                                         GQuark key,
+                                                         const GValue *value);

Attach a value to an IBusSerializable. The value should be serializable as well. Basic type such as integer, string are deemed to be serializable. @@ -378,8 +378,8 @@


ibus_serializable_get_qattachment ()

-
const GValue *      ibus_serializable_get_qattachment   (IBusSerializable *object,
-                                                         GQuark key);
+
const GValue *      ibus_serializable_get_qattachment   (IBusSerializable *object,
+                                                         GQuark key);

Get a value from attachment of an IBusSerializable. see_also: ibus_serializable_set_attachment(). @@ -410,7 +410,7 @@

ibus_serializable_remove_qattachment ()

void                ibus_serializable_remove_qattachment
                                                         (IBusSerializable *object,
-                                                         GQuark key);
+ GQuark key);

Remove a value from attachment of an IBusSerializable. see_also: ibus_serializable_remove_attachment(). @@ -461,7 +461,7 @@


ibus_serializable_serialize ()

-
gboolean            ibus_serializable_serialize         (IBusSerializable *object,
+
gboolean            ibus_serializable_serialize         (IBusSerializable *object,
                                                          IBusMessageIter *iter);

Serialize an IBusSerializable to an IBusMessageIter. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusServer.html ibus-1.3.8/docs/reference/ibus/html/IBusServer.html --- ibus-1.3.7/docs/reference/ibus/html/IBusServer.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusServer.html 2010-10-22 06:16:35.000000000 +0000 @@ -52,21 +52,21 @@ void (*IBusNewConnectionFunc) (IBusServer *server, IBusConnection *connection); IBusServer * ibus_server_new (void); -gboolean ibus_server_listen (IBusServer *server, - const gchar *address); +gboolean ibus_server_listen (IBusServer *server, + const gchar *address); void ibus_server_disconnect (IBusServer *server); -const gchar * ibus_server_get_address (IBusServer *server); -const gchar * ibus_server_get_id (IBusServer *server); -gboolean ibus_server_is_connected (IBusServer *server); -gboolean ibus_server_set_auth_mechanisms (IBusServer *server, - const gchar **mechanisms); +const gchar * ibus_server_get_address (IBusServer *server); +const gchar * ibus_server_get_id (IBusServer *server); +gboolean ibus_server_is_connected (IBusServer *server); +gboolean ibus_server_set_auth_mechanisms (IBusServer *server, + const gchar **mechanisms);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusServer
 
@@ -74,7 +74,7 @@

Properties

-  "connection-type"          GType*                : Read / Write
+  "connection-type"          GType*                : Read / Write
 
@@ -165,8 +165,8 @@

ibus_server_listen ()

-
gboolean            ibus_server_listen                  (IBusServer *server,
-                                                         const gchar *address);
+
gboolean            ibus_server_listen                  (IBusServer *server,
+                                                         const gchar *address);

Listens for new connections on the given address.

@@ -223,7 +223,7 @@

ibus_server_get_address ()

-
const gchar *       ibus_server_get_address             (IBusServer *server);
+
const gchar *       ibus_server_get_address             (IBusServer *server);

Returns the address of the server, as a newly-allocated string which must be freed by the caller.

@@ -246,7 +246,7 @@

ibus_server_get_id ()

-
const gchar *       ibus_server_get_id                  (IBusServer *server);
+
const gchar *       ibus_server_get_id                  (IBusServer *server);

Returns the unique ID of the server, as a newly-allocated string which must be freed by the caller.

@@ -283,7 +283,7 @@

ibus_server_is_connected ()

-
gboolean            ibus_server_is_connected            (IBusServer *server);
+
gboolean            ibus_server_is_connected            (IBusServer *server);

Returns TRUE if the server is still listening for new connections.

@@ -306,8 +306,8 @@

ibus_server_set_auth_mechanisms ()

-
gboolean            ibus_server_set_auth_mechanisms     (IBusServer *server,
-                                                         const gchar **mechanisms);
+
gboolean            ibus_server_set_auth_mechanisms     (IBusServer *server,
+                                                         const gchar **mechanisms);

Sets the authentication mechanisms that this server offers to clients, as a NULL-terminated array of mechanism names. @@ -345,7 +345,7 @@

Property Details

The "connection-type" property

-
  "connection-type"          GType*                : Read / Write
+
  "connection-type"          GType*                : Read / Write

The connection type of server object.

@@ -356,8 +356,8 @@

The "new-connection" signal

void                user_function                      (IBusServer *server,
-                                                        GObject    *connection,
-                                                        gpointer    user_data)       : Run Last
+ GObject *connection, + gpointer user_data) : Run Last

Emitted when a new connection is coming in. In this handler, IBus could add a reference and continue processing the connection. diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusService.html ibus-1.3.8/docs/reference/ibus/html/IBusService.html --- ibus-1.3.7/docs/reference/ibus/html/IBusService.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusService.html 2010-10-22 06:16:35.000000000 +0000 @@ -49,36 +49,36 @@

Synopsis

                    IBusService;
                     IBusServiceClass;
-gboolean            (*ServiceIBusMessageFunc)           (IBusService *service,
+gboolean            (*ServiceIBusMessageFunc)           (IBusService *service,
                                                          IBusConnection *connection,
                                                          IBusMessage *message);
-gboolean            (*ServiceIBusSignalFunc)            (IBusService *service,
+gboolean            (*ServiceIBusSignalFunc)            (IBusService *service,
                                                          IBusConnection *connection,
                                                          IBusMessage *message);
-IBusService *       ibus_service_new                    (const gchar *path);
-const gchar *       ibus_service_get_path               (IBusService *service);
-gboolean            ibus_service_handle_message         (IBusService *service,
+IBusService *       ibus_service_new                    (const gchar *path);
+const gchar *       ibus_service_get_path               (IBusService *service);
+gboolean            ibus_service_handle_message         (IBusService *service,
                                                          IBusConnection *connection,
                                                          IBusMessage *message);
-gboolean            ibus_service_add_to_connection      (IBusService *service,
+gboolean            ibus_service_add_to_connection      (IBusService *service,
                                                          IBusConnection *connection);
-GList *             ibus_service_get_connections        (IBusService *service);
-gboolean            ibus_service_remove_from_connection (IBusService *service,
+GList *             ibus_service_get_connections        (IBusService *service);
+gboolean            ibus_service_remove_from_connection (IBusService *service,
                                                          IBusConnection *connection);
-gboolean            ibus_service_remove_from_all_connections
+gboolean            ibus_service_remove_from_all_connections
                                                         (IBusService *service);
-gboolean            ibus_service_send_signal            (IBusService *service,
-                                                         const gchar *interface,
-                                                         const gchar *name,
-                                                         GType first_arg_type,
+gboolean            ibus_service_send_signal            (IBusService *service,
+                                                         const gchar *interface,
+                                                         const gchar *name,
+                                                         GType first_arg_type,
                                                          ...);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusService
                      +----IBusFactory
@@ -90,7 +90,7 @@
 

Properties

-  "path"                     gchar*                : Read / Write / Construct Only
+  "path"                     gchar*                : Read / Write / Construct Only
 
@@ -136,7 +136,7 @@

ServiceIBusMessageFunc ()

-
gboolean            (*ServiceIBusMessageFunc)           (IBusService *service,
+
gboolean            (*ServiceIBusMessageFunc)           (IBusService *service,
                                                          IBusConnection *connection,
                                                          IBusMessage *message);

@@ -163,7 +163,7 @@

@@ -172,7 +172,7 @@

ServiceIBusSignalFunc ()

-
gboolean            (*ServiceIBusSignalFunc)            (IBusService *service,
+
gboolean            (*ServiceIBusSignalFunc)            (IBusService *service,
                                                          IBusConnection *connection,
                                                          IBusMessage *message);

@@ -199,7 +199,7 @@

@@ -208,7 +208,7 @@

ibus_service_new ()

-
IBusService *       ibus_service_new                    (const gchar *path);
+
IBusService *       ibus_service_new                    (const gchar *path);

New an IBusService.

@@ -231,7 +231,7 @@

ibus_service_get_path ()

-
const gchar *       ibus_service_get_path               (IBusService *service);
+
const gchar *       ibus_service_get_path               (IBusService *service);

Returns the object path of an IBusService.

@@ -254,7 +254,7 @@

ibus_service_handle_message ()

-
gboolean            ibus_service_handle_message         (IBusService *service,
+
gboolean            ibus_service_handle_message         (IBusService *service,
                                                          IBusConnection *connection,
                                                          IBusMessage *message);

@@ -289,7 +289,7 @@


ibus_service_add_to_connection ()

-
gboolean            ibus_service_add_to_connection      (IBusService *service,
+
gboolean            ibus_service_add_to_connection      (IBusService *service,
                                                          IBusConnection *connection);

Add an IBus Service to an IBusConnection. @@ -319,7 +319,7 @@


ibus_service_get_connections ()

-
GList *             ibus_service_get_connections        (IBusService *service);
+
GList *             ibus_service_get_connections        (IBusService *service);

Returns a copy of list of connections, but the caller does not own the element.

@@ -342,7 +342,7 @@

ibus_service_remove_from_connection ()

-
gboolean            ibus_service_remove_from_connection (IBusService *service,
+
gboolean            ibus_service_remove_from_connection (IBusService *service,
                                                          IBusConnection *connection);

Remove an IBusService from an IBusConnection. @@ -372,7 +372,7 @@


ibus_service_remove_from_all_connections ()

-
gboolean            ibus_service_remove_from_all_connections
+
gboolean            ibus_service_remove_from_all_connections
                                                         (IBusService *service);

Remove an IBusService from all connections. @@ -397,10 +397,10 @@


ibus_service_send_signal ()

-
gboolean            ibus_service_send_signal            (IBusService *service,
-                                                         const gchar *interface,
-                                                         const gchar *name,
-                                                         GType first_arg_type,
+
gboolean            ibus_service_send_signal            (IBusService *service,
+                                                         const gchar *interface,
+                                                         const gchar *name,
+                                                         GType first_arg_type,
                                                          ...);

Send signal to all the IBusConnections of an IBusService. @@ -449,7 +449,7 @@

Property Details

The "path" property

-
  "path"                     gchar*                : Read / Write / Construct Only
+
  "path"                     gchar*                : Read / Write / Construct Only

The path of service object.

@@ -460,10 +460,10 @@

Signal Details

The "ibus-message" signal

-
gboolean            user_function                      (IBusService *service,
-                                                        gpointer     connection,
-                                                        gpointer     message,
-                                                        gpointer     user_data)       : Run Last
+
gboolean            user_function                      (IBusService *service,
+                                                        gpointer     connection,
+                                                        gpointer     message,
+                                                        gpointer     user_data)       : Run Last

Send a message as IBusMessage though the connection.

@@ -504,10 +504,10 @@

The "ibus-signal" signal

-
gboolean            user_function                      (IBusService *service,
-                                                        gpointer     connection,
-                                                        gpointer     message,
-                                                        gpointer     user_data)       : Run Last
+
gboolean            user_function                      (IBusService *service,
+                                                        gpointer     connection,
+                                                        gpointer     message,
+                                                        gpointer     user_data)       : Run Last

Send a signal as IBusMessage though the connection.

diff -Nru ibus-1.3.7/docs/reference/ibus/html/IBusText.html ibus-1.3.8/docs/reference/ibus/html/IBusText.html --- ibus-1.3.7/docs/reference/ibus/html/IBusText.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/IBusText.html 2010-10-22 06:16:35.000000000 +0000 @@ -41,25 +41,25 @@

Synopsis

                    IBusText;
                     IBusTextClass;
-IBusText *          ibus_text_new_from_string           (const gchar *str);
-IBusText *          ibus_text_new_from_ucs4             (const gunichar *str);
-IBusText *          ibus_text_new_from_static_string    (const gchar *str);
-IBusText *          ibus_text_new_from_printf           (const gchar *fmt,
+IBusText *          ibus_text_new_from_string           (const gchar *str);
+IBusText *          ibus_text_new_from_ucs4             (const gunichar *str);
+IBusText *          ibus_text_new_from_static_string    (const gchar *str);
+IBusText *          ibus_text_new_from_printf           (const gchar *fmt,
                                                          ...);
-IBusText *          ibus_text_new_from_unichar          (gunichar c);
+IBusText *          ibus_text_new_from_unichar          (gunichar c);
 void                ibus_text_append_attribute          (IBusText *text,
-                                                         guint type,
-                                                         guint value,
-                                                         guint start_index,
-                                                         gint end_index);
-guint               ibus_text_get_length                (IBusText *text);
+                                                         guint type,
+                                                         guint value,
+                                                         guint start_index,
+                                                         gint end_index);
+guint               ibus_text_get_length                (IBusText *text);
 

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----IBusObject
                +----IBusSerializable
                      +----IBusText
@@ -91,12 +91,12 @@
 
- + - + @@ -121,7 +121,7 @@

ibus_text_new_from_string ()

-
IBusText *          ibus_text_new_from_string           (const gchar *str);
+
IBusText *          ibus_text_new_from_string           (const gchar *str);

New an IBusText from a string.

@@ -147,7 +147,7 @@

ibus_text_new_from_ucs4 ()

-
IBusText *          ibus_text_new_from_ucs4             (const gunichar *str);
+
IBusText *          ibus_text_new_from_ucs4             (const gunichar *str);

New an IBusText from an UCS-4 encoded string.

@@ -173,7 +173,7 @@

ibus_text_new_from_static_string ()

-
IBusText *          ibus_text_new_from_static_string    (const gchar *str);
+
IBusText *          ibus_text_new_from_static_string    (const gchar *str);

New an IBusText from a static string.

@@ -200,7 +200,7 @@

ibus_text_new_from_printf ()

-
IBusText *          ibus_text_new_from_printf           (const gchar *fmt,
+
IBusText *          ibus_text_new_from_printf           (const gchar *fmt,
                                                          ...);

New an IBusText from a printf expression. @@ -232,7 +232,7 @@


ibus_text_new_from_unichar ()

-
IBusText *          ibus_text_new_from_unichar          (gunichar c);
+
IBusText *          ibus_text_new_from_unichar          (gunichar c);

New an IBusText from a single UCS4-encoded character.

@@ -256,10 +256,10 @@

ibus_text_append_attribute ()

void                ibus_text_append_attribute          (IBusText *text,
-                                                         guint type,
-                                                         guint value,
-                                                         guint start_index,
-                                                         gint end_index);
+ guint type, + guint value, + guint start_index, + gint end_index);

Append an IBusAttribute for IBusText.

@@ -297,10 +297,10 @@

ibus_text_get_length ()

-
guint               ibus_text_get_length                (IBusText *text);
+
guint               ibus_text_get_length                (IBusText *text);

Return number of characters in an IBusText. -This function is based on g_utf8_strlen(), so unlike strlen(), +This function is based on g_utf8_strlen(), so unlike strlen(), it does not count by bytes but characters instead.

GArray *properties;

GArray *properties;

GArray that holds IBusProperties.

Returns :

-TRUE if succeed; FALSE if failed. +TRUE if succeed; FALSE if failed.

Returns :

-TRUE if succeed; FALSE if failed. +TRUE if succeed; FALSE if failed.

gboolean is_static;

gboolean is_static;

Whether text is static, i.e., no need and will not be freed. Only TRUE if IBusText is newed from ibus_text_new_from_static_string().

gchar *text;

gchar *text;

The string content of IBusText in UTF-8.
diff -Nru ibus-1.3.7/docs/reference/ibus/html/index.html ibus-1.3.8/docs/reference/ibus/html/index.html --- ibus-1.3.7/docs/reference/ibus/html/index.html 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/html/index.html 2010-10-22 06:16:35.000000000 +0000 @@ -15,7 +15,7 @@

- Intelligent Input Bus (IBus) 1.3.7 reference manual. + Intelligent Input Bus (IBus) 1.3.8 reference manual. The latest version of this documentation can be found on-line at http://code.google.com/p/ibus.

diff -Nru ibus-1.3.7/docs/reference/ibus/ibus-docs.sgml ibus-1.3.8/docs/reference/ibus/ibus-docs.sgml --- ibus-1.3.7/docs/reference/ibus/ibus-docs.sgml 2010-08-03 09:00:42.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/ibus-docs.sgml 2010-10-22 06:16:31.000000000 +0000 @@ -5,7 +5,7 @@ IBus Reference Manual - Intelligent Input Bus (IBus) 1.3.7 reference manual. + Intelligent Input Bus (IBus) 1.3.8 reference manual. The latest version of this documentation can be found on-line at http://code.google.com/p/ibus. diff -Nru ibus-1.3.7/docs/reference/ibus/Makefile.in ibus-1.3.8/docs/reference/ibus/Makefile.in --- ibus-1.3.7/docs/reference/ibus/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -143,6 +143,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -207,6 +208,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/docs/reference/ibus/tmpl/ibusdbus.sgml ibus-1.3.8/docs/reference/ibus/tmpl/ibusdbus.sgml --- ibus-1.3.7/docs/reference/ibus/tmpl/ibusdbus.sgml 2010-08-03 09:02:24.000000000 +0000 +++ ibus-1.3.8/docs/reference/ibus/tmpl/ibusdbus.sgml 2010-10-22 06:16:35.000000000 +0000 @@ -20,30 +20,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru ibus-1.3.7/docs/reference/Makefile.in ibus-1.3.8/docs/reference/Makefile.in --- ibus-1.3.7/docs/reference/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/docs/reference/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -192,6 +192,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -250,6 +251,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/gconf/config.c ibus-1.3.8/gconf/config.c --- ibus-1.3.7/gconf/config.c 2010-07-23 04:12:34.000000000 +0000 +++ ibus-1.3.8/gconf/config.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ #include diff -Nru ibus-1.3.7/gconf/config.h ibus-1.3.8/gconf/config.h --- ibus-1.3.7/gconf/config.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/gconf/config.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ #ifndef __CONFIG_GCONF_H__ #define __CONFIG_GCONF_H__ diff -Nru ibus-1.3.7/gconf/main.c ibus-1.3.8/gconf/main.c --- ibus-1.3.7/gconf/main.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/gconf/main.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ #include diff -Nru ibus-1.3.7/gconf/Makefile.in ibus-1.3.8/gconf/Makefile.in --- ibus-1.3.7/gconf/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/gconf/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -212,6 +212,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -270,6 +271,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/ibus/interface/Makefile.in ibus-1.3.8/ibus/interface/Makefile.in --- ibus-1.3.7/ibus/interface/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/ibus/interface/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -176,6 +176,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -234,6 +235,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/ibus/Makefile.in ibus-1.3.8/ibus/Makefile.in --- ibus-1.3.7/ibus/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/ibus/Makefile.in 2010-10-22 06:16:24.000000000 +0000 @@ -194,6 +194,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -252,6 +253,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/ibus/property.py ibus-1.3.8/ibus/property.py --- ibus-1.3.7/ibus/property.py 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/ibus/property.py 2010-10-21 10:58:33.000000000 +0000 @@ -185,7 +185,7 @@ def append(self, prop): self.__props.append(prop) - def prepand(self, prop): + def prepend(self, prop): self.__props.insert(0, prop) def insert(self, index, prop): diff -Nru ibus-1.3.7/m4/intltool.m4 ibus-1.3.8/m4/intltool.m4 --- ibus-1.3.7/m4/intltool.m4 2010-07-23 09:04:41.000000000 +0000 +++ ibus-1.3.8/m4/intltool.m4 2010-10-22 05:25:55.000000000 +0000 @@ -172,7 +172,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ diff -Nru ibus-1.3.7/m4/Makefile.in ibus-1.3.8/m4/Makefile.in --- ibus-1.3.7/m4/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/m4/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -152,6 +152,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -210,6 +211,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/Makefile.in ibus-1.3.8/Makefile.in --- ibus-1.3.7/Makefile.in 2010-08-03 09:00:33.000000000 +0000 +++ ibus-1.3.8/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -234,6 +234,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -292,6 +293,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/memconf/config.h ibus-1.3.8/memconf/config.h --- ibus-1.3.7/memconf/config.h 2010-07-30 09:49:08.000000000 +0000 +++ ibus-1.3.8/memconf/config.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* ibus - The Input Bus * Copyright (c) 2010, Google Inc. All rights reserved. * diff -Nru ibus-1.3.7/memconf/Makefile.in ibus-1.3.8/memconf/Makefile.in --- ibus-1.3.7/memconf/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/memconf/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -227,6 +227,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -285,6 +286,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/po/fr.po ibus-1.3.8/po/fr.po --- ibus-1.3.7/po/fr.po 2010-08-03 09:02:25.000000000 +0000 +++ ibus-1.3.8/po/fr.po 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +# translation of ibus.master.fr.po to French # Japanese translation of ibus. # Copyright (C) 2008 Huang Peng # This file is distributed under the same license as the ibus package. @@ -6,20 +7,21 @@ # UTUMI Hirosi , 2008. # Charles-Antoine Couret , 2009. # Humbert Julien , 2009, 2010. +# Sam Friedmann , 2010. msgid "" msgstr "" -"Project-Id-Version: ibus VERSION\n" +"Project-Id-Version: ibus.master.fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-23 13:32+0800\n" -"PO-Revision-Date: 2010-06-04 12:06+0200\n" -"Last-Translator: \n" -"Language-Team: French \n" +"POT-Creation-Date: 2010-08-01 01:47+0000\n" +"PO-Revision-Date: 2010-08-04 11:45+1000\n" +"Last-Translator: Sam Friedmann \n" +"Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../bus/ibus.desktop.in.h:1 @@ -27,14 +29,12 @@ msgstr "IBus" #: ../bus/ibus.desktop.in.h:2 -#, fuzzy msgid "Input Method Framework" -msgstr "Environnement de méthode de saisie iBus" +msgstr "Framework de méthode de saisie" #: ../bus/ibus.desktop.in.h:3 -#, fuzzy msgid "Start IBus Input Method Framework" -msgstr "Environnement de méthode de saisie iBus" +msgstr "Démarrer le framework de méthode de saisie IBus" #: ../ibus/_config.py.in:38 msgid "" @@ -74,7 +74,7 @@ #: ../ui/gtk/panel.py:113 msgid "IBus input method framework" -msgstr "Environnement de méthode de saisie iBus" +msgstr "Framework de méthode de saisie iBus" #: ../ui/gtk/panel.py:331 msgid "Restart" @@ -96,20 +96,20 @@ msgid "translator-credits" msgstr "HUMBERT Julien " -#: ../ui/gtk/languagebar.py:107 +#: ../ui/gtk/languagebar.py:108 msgid "About the input method" msgstr "À propos de la méthode d'entrée" -#: ../ui/gtk/languagebar.py:215 +#: ../ui/gtk/languagebar.py:216 msgid "Switch input method" msgstr "Changer de méthode d'entrée" -#: ../ui/gtk/languagebar.py:358 ../ui/gtk/engineabout.py:35 +#: ../ui/gtk/languagebar.py:359 ../ui/gtk/engineabout.py:35 #: ../setup/engineabout.py:35 ../setup/setup.ui.h:16 msgid "About" msgstr "À propos" -#: ../ui/gtk/languagebar.py:362 +#: ../ui/gtk/languagebar.py:363 msgid "About the Input Method" msgstr "À propos de la méthode d'entrée" @@ -207,12 +207,11 @@ #: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:30 msgid "IBus Preferences" -msgstr "Préférences IBus" +msgstr "Préférences de IBus" #: ../setup/ibus-setup.desktop.in.h:2 -#, fuzzy msgid "Set IBus Preferences" -msgstr "Préférences IBus" +msgstr "Définir les préférences de IBus" #: ../data/ibus.schemas.in.h:1 msgid "Auto hide" @@ -240,8 +239,7 @@ #: ../data/ibus.schemas.in.h:7 msgid "Enable input method by default when the application gets input focus" -msgstr "" -"Par défaut, activer la méthode d'entrée lorsque l'application reçoit le focus" +msgstr "Par défaut, activer la méthode d'entrée lorsque l'application reçoit le focus" #: ../data/ibus.schemas.in.h:8 msgid "Language panel position" @@ -306,8 +304,7 @@ #: ../data/ibus.schemas.in.h:21 msgid "The shortcut keys for switching to the next input method in the list" -msgstr "" -"Raccourci clavier pour passer à la méthode d'entrée suivante de la liste" +msgstr "Raccourci clavier pour passer à la méthode d'entrée suivante de la liste" #: ../data/ibus.schemas.in.h:22 msgid "The shortcut keys for switching to the previous input method" @@ -471,8 +468,7 @@ #: ../setup/setup.ui.h:37 msgid "Remove the selected input method from the enabled input methods" -msgstr "" -"Supprimer la méthode d'entrée selectionnée des méthodes d'entrées actives" +msgstr "Supprimer la méthode d'entrée selectionnée des méthodes d'entrées actives" #: ../setup/setup.ui.h:38 msgid "Set the behavior of ibus how to show or hide language bar" @@ -502,13 +498,11 @@ #: ../setup/setup.ui.h:47 msgid "The shortcut keys for switching to next input method in the list" -msgstr "" -"Raccourci clavier pour passer à la méthode d'entrée suivante de la liste" +msgstr "Raccourci clavier pour passer à la méthode d'entrée suivante de la liste" #: ../setup/setup.ui.h:48 msgid "The shortcut keys for switching to previous input method in the list" -msgstr "" -"Raccourci clavier pour revenir à la méthode d'entrée précédente de la liste" +msgstr "Raccourci clavier pour revenir à la méthode d'entrée précédente de la liste" #: ../setup/setup.ui.h:50 msgid "Top left corner" @@ -530,51 +524,3 @@ msgid "When active" msgstr "Uniquement lorsque active" -#~ msgid "Never" -#~ msgstr "Ne jamais afficher" - -#~ msgid "Show in Status Icon menu" -#~ msgstr "Afficher l'icône de statut dans le menu" - -#, fuzzy -#~ msgid "Use global engine" -#~ msgstr "Précharger les moteurs" - -#, fuzzy -#~ msgid "Langauge panel position" -#~ msgstr "Afficher la barre de langue :" - -#~ msgid "Custom font:" -#~ msgstr "Police personnalisée :" - -#, fuzzy -#~ msgid "Font for language bar and candidates" -#~ msgstr "" -#~ "Choix d'une police personnalisée pour la barre de langue et les candidats" - -#~ msgid "Use custom font for language bar and candidates" -#~ msgstr "" -#~ "Utiliser une police personnalisée pour le barre de langue et les candidats" - -#~ msgid "Custom Font" -#~ msgstr "Police personnalisée" - -#~ msgid "Show IM Name" -#~ msgstr "Afficher le nom de la méthode d'entrée" - -#~ msgid "Show IM name on language bar" -#~ msgstr "Afficher le nom de la méthode d'entrée sur la barre de langue" - -#~ msgid "Use Custom Font" -#~ msgstr "Utiliser une police personnalisée" - -#~ msgid "Next engine hotkey for switch to next input method engine" -#~ msgstr "Raccourci clavier pour passer au moteur de méthode d'entrée suivant" - -#~ msgid "Prev engine hotkey for switch to previous input method engine" -#~ msgstr "" -#~ "Raccourci clavier pour revenir au moteur de méthode d'entrée précédant" - -#~ msgid "Trigger hotkey for enable or disable input context" -#~ msgstr "" -#~ "Raccourci clavier d'activation ou de désactivation la méthode d'entrée" diff -Nru ibus-1.3.7/po/gu.po ibus-1.3.8/po/gu.po --- ibus-1.3.7/po/gu.po 2010-08-03 09:02:25.000000000 +0000 +++ ibus-1.3.8/po/gu.po 2010-10-21 10:58:33.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: ibus.master.gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-28 18:37+0000\n" -"PO-Revision-Date: 2010-07-29 17:54+0530\n" +"POT-Creation-Date: 2010-09-19 07:17+0000\n" +"PO-Revision-Date: 2010-09-20 12:26+0530\n" "Last-Translator: Sweta Kothari \n" "Language-Team: Gujarati\n" "MIME-Version: 1.0\n" @@ -374,8 +374,8 @@ "The default input method is the top one in the list.\n" "You may use up/down buttons to change it." msgstr "" -"મૂળભૂત ઇનપુટ પદ્દતિ એ યાદીમાં ઉપર છે.\n" -"તમારે તેને બદલવા માટે ઉપર/નીચે બટનોને વાપરી શકો છો." +"મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\n" +"તેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો." #: ../setup/setup.ui.h:17 msgid "Add the selected input method into the enabled input methods" diff -Nru ibus-1.3.7/setup/keyboardshortcut.py ibus-1.3.8/setup/keyboardshortcut.py --- ibus-1.3.7/setup/keyboardshortcut.py 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/setup/keyboardshortcut.py 2010-10-21 10:58:33.000000000 +0000 @@ -235,16 +235,19 @@ dlg.set_markup(message) dlg.set_title(_("Please press a key (or a key combination)")) - def __key_release_event(d, k, out): + def __key_press_event(d, k, out): out.append(k.copy()) + + def __key_release_event(d, k, out): d.response(gtk.RESPONSE_OK) - dlg.connect("key-release-event", __key_release_event, out) + dlg.connect("key-press-event", __key_press_event, out) + dlg.connect("key-release-event", __key_release_event, None) id = dlg.run() dlg.destroy() if id != gtk.RESPONSE_OK or not out: return - keyevent = out[0] + keyevent = out[len(out) - 1] state = keyevent.state & (gdk.CONTROL_MASK | \ gdk.SHIFT_MASK | \ gdk.MOD1_MASK | \ diff -Nru ibus-1.3.7/setup/Makefile.in ibus-1.3.8/setup/Makefile.in --- ibus-1.3.7/setup/Makefile.in 2010-08-03 09:00:32.000000000 +0000 +++ ibus-1.3.8/setup/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -181,6 +181,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -239,6 +240,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/src/IBus-1.0.gir ibus-1.3.8/src/IBus-1.0.gir --- ibus-1.3.7/src/IBus-1.0.gir 2010-08-03 09:00:47.000000000 +0000 +++ ibus-1.3.8/src/IBus-1.0.gir 2010-10-22 06:16:34.000000000 +0000 @@ -2,25 +2,17 @@ - - + - - - - @@ -734,39 +726,39 @@ - + Array of IBusAttribute. + + New an IBusAttrList. + A newly allocated IBusAttrList. - + + Append an IBusAttribute to IBusAttrList, and increase reference. + The IBusAttribute instance to be appended. - - + + Returns IBusAttribute at given index. Borrowed reference. + + IBusAttribute at given index, NULL if no such IBusAttribute. + Index of the @attr_list. @@ -786,10 +778,10 @@ + Type enumeration of IBusText attribute. + Type of IBusText attribute. - + Signify the type, value and scope of the attribute. +The scope starts from @start_index till the @end_index-1. + + New an IBusAttribute. + A newly allocated IBusAttribute. + Type of the attribute. + Value of the attribute. + Where attribute starts. + Where attribute ends. @@ -904,262 +900,274 @@ - + An opaque data type representing IBus bus (daemon communication) status. + + New an IBusBus instance. + A newly allocated IBusBus instance, and the instance is not floating. - + + Return TRUE if @bus is connected to IBus daemon. + TRUE if @bus is connected, FALSE otherwise. - + + Return IBusConnection of an IBusIBus instance. + TRUE if @bus is connected, FALSE otherwise. - + + This function sends a "HELLO" message to DBus daemon, +which replies the unique name of current IBus process. + The unique name of IBus process in DBus. - + + Request a name from IBus daemon. + 0 if failed; positive number otherwise. + Name to be requested. + Flags (FixMe). - + + Release a name to IBus daemon. + 0 if failed; positive number otherwise. + Name to be released. - + + Whether the name has owner. + TRUE if the name has owner, FALSE otherwise. + Name to be released. - - + + Return lists that attached to @bus. +<note><para>[FixMe] Not implemented yet, only return NULL.</para></note> + + Lists that attached to @bus. - + + Add a match rule to an IBusBus. + Match rule. - + + Remove a match rule to an IBusBus. + Match rule. - + + Return the name owner. + Owner of the name. The returned value must be freed with g_free(). + Name. - + + Exit or restart an IBusBus. + TRUE if the "Exit" call is suceeded, FALSE otherwise. + Whether restarting the ibus. + c:identifier="ibus_bus_create_input_context"> + Create an input context for client. + An newly allocated IBusInputContext if the "CreateInputContext" call is suceeded, NULL otherwise. + Name of client. + c:identifier="ibus_bus_current_input_context"> + Get the current focused input context. + The named of currently focued IBusInputContext if the "CurrentInputContext" call suceeded, NULL otherwise. The return value must be freed with g_free(). + c:identifier="ibus_bus_register_component"> + Register a componet to an IBusBus. + TRUE if the "RegisterComponent" call is suceeded, FALSE otherwise. + A input engine component. - - + + List engines. +Note that this function is not yet implemented. + + A List of engines. + List active engines. Note that this function is not yet implemented. -<note><para>Not yet implemented.</para></note>"> - +<note><para>Not yet implemented.</para></note> + + A List of active engines. + c:identifier="ibus_bus_get_use_sys_layout"> + Check if the bus's "use_sys_layout" option is enabled or not. + TRUE if "use_sys_layout" option is enabled. + c:identifier="ibus_bus_get_use_global_engine"> + Check if the bus's "use_global_engine" option is enabled or not. + TRUE if "use_global_engine" option is enabled. + c:identifier="ibus_bus_is_global_engine_enabled"> + Check if the current global engine is enabled or not. + TRUE if the current global engine is enabled. + c:identifier="ibus_bus_get_global_engine"> + Get the description of current global engine. + The description of current global engine, or NULL if there is no global engine. + c:identifier="ibus_bus_set_global_engine"> + Set current global engine. + TRUE if the global engine was set successfully. + A new engine name. - + + Get the config instance from IBusBus. + An newly allocated IBusConfig which is configurable with @bus. - + + Emitted when IBusBus is connected. +<note><para>Argument @user_data is ignored in this function.</para></note> - + + Emitted when IBusBus is disconnected. +<note><para>Argument @user_data is ignored in this function.</para></note> - + + Emitted when global engine is changed. +<note><para>Argument @user_data is ignored in this function.</para></note> @@ -1193,11 +1201,10 @@ + Capability flags of UI. - + An IBusComponent stores component information. + + New an IBusComponent. + A newly allocated IBusComponent. + Name of the component. + Detailed description of component. + Component version. + Distribution license of this component. - + + Author(s) of the component. + Homepage of the component. + path to component executable. + Domain name for dgettext() + c:identifier="ibus_component_new_from_xml_node"> + New an IBusComponent from an XML tree. + A newly allocated IBusComponent. + Root node of component XML tree. + New an IBusComponent from an XML file. Note that a component file usually contains engine descriptions, if it does, ibus_engine_desc_new_from_xml_node() will be called -to load the engine descriptions."> +to load the engine descriptions. + A newly allocated IBusComponent. + An XML file that contains component information. - + c:identifier="ibus_component_get_from_engine"> + Get the IBusComponent from an engine description. + + An IBusComponent of the engine. + A description of an engine. + c:identifier="ibus_component_add_observed_path"> + Add an observed path to IBusComponent. + Observed path to be added. + TRUE for filling the file status; FALSE otherwise. - + + Add an engine to IBusComponent according to the description in @engine. + A description of an engine. - - + + Get the engines of this component. + + A newly allocated GList that contains engines. - + + Output IBusComponent as an XML-formatted string. +The output string can be then shown on the screen or written to file. + GString that holds the result. + level of indent. + c:identifier="ibus_component_output_engines"> + Output engine description as an XML-formatted string. +The output string can be then shown on the screen or written to file. + GString that holds the result. + level of indent. + c:identifier="ibus_component_check_modification"> + Check whether the observed paths of component is modified. + TRUE if at least one of the observed paths is modified; FALSE otherwise. - + + Whether the IBusComponent is started. + TRUE if the component is started; FALSE otherwise. + if FALSE, redirect the child output to /dev/null - + + Whether the IBusComponent is stopped. + TRUE if the component is stopped; FALSE otherwise. - + + Whether the IBusComponent is running. + TRUE if the component is running; FALSE otherwise. - + + Set whether the component needs to be restarted when it dies. + if TRUE, the component will be restartd when it dies. @@ -1468,10 +1492,14 @@ - + + + - + + + @@ -1494,76 +1522,85 @@ - + An opaque data type representing an IBusConfig. + + New a IBusConfig from existing IBusConnection. + An newly allocated IBusConfig corresponding to @connection. + An IBusConnection. - + Get the value of a configuration option. GConf stores configure options in a tree-like structure, and the IBus related setting is at /desktop/ibus, thus, @section here is a path from there, while @name is the key of that configuration option. ibus-chewing, for example, stores its setting in /desktop/ibus/engine/Chewing, -so the section name for it is "engine/Chewing"."> +so the section name for it is "engine/Chewing". + TRUE if succeed; FALSE otherwise. + Section name of the configuration option. + Name of the configure option. + GValue that holds the value. - + + Set the value of a configuration option. + TRUE if succeed; FALSE otherwise. + Section name of the configuration option. + Name of the configure option its self. + GValue that holds the value. - + + Remove an entry of a configuration option. + TRUE if succeed; FALSE otherwise. + Section name of the configuration option. + Name of the configure option its self. @@ -1571,20 +1608,23 @@ - + + Emitted when configuration value is changed. +<note><para>Argument @user_data is ignored in this function.</para></note> + Section name. + Name of the property. + Value. @@ -1599,19 +1639,20 @@ - + An opaque data type representing a configure service. + + New an IBusConfigService from an IBusConnection. + A newly allocated IBusConfigServices. + An IBusConnection. @@ -1671,20 +1712,23 @@ + c:identifier="ibus_config_service_value_changed"> + Change a value of a configuration option +by sending a "ValueChanged" message to IBus service. + Section name of the configuration option. + Name of the configure option. + GValue that holds the value. @@ -1692,7 +1736,8 @@ + transfer-ownership="none"> + Connection of this IBusConfigService. @@ -1782,44 +1827,47 @@ - + An opaque data type representing an IBusConnection. + + New an IBusConnection. + An newly allocated IBusConnection. - + Open an IBusConnection that is set to a D-Bus connection to the specified address. Use ibus_connection_open_private() to get a dedicated connection not shared with other callers of -ibus_connection_open()."> +ibus_connection_open(). + A newly allocated IBusConnection which is set to a D-Bus connection corresponding to @address. + A remote address. + Open an IBusConnection that is set to a D-Bus connection to the specified address. Unlike ibus_connection_open(), this function always creates a new D-Bus connection. The D-Bus connection will not be saved or recycled by libdbus. In D-Bus documentation, dbus_connection_open() is preferred over dbus_connection_open_private(), -so should ibus_connection_open() be preferred over ibus_connection_open_private()."> +so should ibus_connection_open() be preferred over ibus_connection_open_private(). + A newly allocated IBusConnection which is set to a D-Bus connection corresponding to @address. + A remote address. @@ -1855,61 +1903,65 @@ + c:identifier="ibus_connection_set_connection"> + Set an IBusConnection as data of a D-Bus connection. +Emit signal <constant>ibus-message</constant> when receiving incoming message from @dbus_connection. + A D-Bus connection. + Whether the @dbus_connection is shared. - + + Close an IBusCOnnection and corresponding D-Bus connection. - + + Whether an IBusConnection is connected. + TRUE for connected; FALSE otherwise. + c:identifier="ibus_connection_is_authenticated"> + Whether an IBusConnection is authenticated. + TRUE for authenticated; FALSE otherwise. + c:identifier="ibus_connection_get_connection"> + Return corresponding DBusConnection. + The corresponding DBusConnection. + c:identifier="ibus_connection_get_unix_user"> + Return The UNIX UID of peer user. + The UNIX UID of peer user. + Return TRUE if the disconnect message has not been processed. This function is a wrapper of dbus_connection_read_write_dispatch(), -which is also intended for use with applications that don't want to +which is also intended for use with applications that don't want to write a main loop and deal with DBusWatch and DBusTimeout. Following text is from the documentation of dbus_connection_read_write_dispatch(): @@ -1927,50 +1979,59 @@ then read or write, then return. The way to think of this function is that it either makes some sort of progress, or it blocks. Note that, while it is blocked on I/O, it cannot be interrupted (even by other threads), -which makes this function unsuitable for applications that do more than just react to received messages."> +which makes this function unsuitable for applications that do more than just react to received messages. + TRUE if the disconnect message has not been processed; FALSE otherwise. + Maximum time to block or -1 for infinite. - + Send an IBusMessage to an IBusConnection. If succeed, signal <constant>ibus-message-sent</constant> is emitted. ibus_connection_send_signal(), ibus_connection_send_signal_valist(), ibus_connection_send_valist(), -dbus_connection_send()."> +dbus_connection_send(). + TRUE if succeed; FALSE otherwise. + IBusMessage to be sent. + Send a wrapped D-Bus signal to an IBusConnection. This function wraps a signal as an IBusMessage, then sent the IBusMessage -via ibus_connection_send()."> +via ibus_connection_send(). + TRUE if succeed; FALSE otherwise. + The path to the object emitting the signal. + The interface the signal is emitted from. + Name of the signal. + Type of first argument. @@ -1980,71 +2041,87 @@ + Queues an IBusMessage to send, and returns a IBusPendingCall used to receive a reply to the message. This function is a wrapper of dbus_connection_send_with_reply(). ibus_proxy_call_with_reply(), -#IBusPendingCall, dbus_connection_send_with_reply()"> +#IBusPendingCall, dbus_connection_send_with_reply() + FALSE if no memory, TRUE otherwise. + An IBusMessage. + Return location of a IBusPendingCall object, or NULL if connection is disconnected. + timeout in milliseconds or -1 for default. + Sends an IBus message and blocks a certain time period while waiting for an IBusMessage as reply. If the IBusMessage is not NULL, signal <constant>ibus-message-sent</constant> is emitted. -dbus_connection_send_with_reply_and_block()"> +dbus_connection_send_with_reply_and_block() + An IBusMessage that is the reply or NULL with an error code if the function fails. + An IBusMessage. + timeout in milliseconds or -1 for default. + Returned error is stored here; NULL to ignore error. + introspectable="0"> + Invoke a member function by sending an IBusMessage. This method does not +support reply message, use ibus_connection_call_with_reply instead. + TRUE if succeed; FALSE otherwise. + Name of the signal. + The path to the object emitting the signal. + The interface the signal is emitted from. + The name of the member function to be called. + Returned error is stored here; NULL to ignore error. + Type of first argument. @@ -2055,28 +2132,35 @@ + introspectable="0"> + Invoke a member function by sending an IBusMessage. + Reply message, or NULL when fail. The returned message must be freed with ibus_message_unref(). + Name of the signal. + The path to the object emitting the signal. + The interface the signal is emitted from. + The name of the member function to be called. + Returned error is stored here; NULL to ignore error. + Type of first argument. @@ -2085,48 +2169,53 @@ - + + Blocks until the outgoing message queue is empty. +This function is a wrapper of dbus_connection_flush(). + Registers a handler for a given path in the object hierarchy. The given vtable handles messages sent to exactly the given path. -This function is a wrapper of dbus_connection_register_object_path()."> +This function is a wrapper of dbus_connection_register_object_path(). + FALSE if fail because of out of memory; TRUE otherwise. + Object path to be register. + Callback function for message handling. + User data for @message_func. + Unregisters the handler registered with exactly the given path. +It's a bug to call this function for a path that isn't registered. Can unregister both fallback paths and object paths. -This function is a wrapper of dbus_connection_unregister_object_path()"> +This function is a wrapper of dbus_connection_unregister_object_path() + FALSE if fail because of out of memory; TRUE otherwise. + Object path to be unregister. @@ -2134,62 +2223,69 @@ - + Emitted when sending an ibus-message. Implement the member function ibus_message() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + TRUE if succeed; FALSE otherwise. + unix user id. - + Emitted when an ibus-message is disconnected. Implement the member function disconnected() function in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when sending an ibus-message. Implement the member function ibus_message() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + TRUE if succeed; FALSE otherwise. + An IBusMessage. - + Emitted when an ibus-message is sent. Implement the member function ibus_message_sent() function in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + An IBusMessage that contain the signal. - + Emitted when sending an ibus-signal. Implement the member function ibus_signal() function in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + TRUE if succeed; FALSE otherwise. + An IBusMessage that contain the signal. @@ -2280,20 +2376,23 @@ - + + Prototype of an IBusConnectionReplyFunc callback function. + TRUE if succeed; FALSE otherwise. + An IBusConnection. + An IBusMessage. + User data for the callback function. @@ -2624,42 +2723,36 @@ - + + A prototype of callback to DBus connection setup function. + A DBusConnection + User data to be passed to callback function. - - - - - - - - - + + A prototype of DBus server setup function. + A DBusConnection + User data to be passed to callback function. @@ -2747,262 +2840,295 @@ - + IBusEngine properties. + + New an IBusEngine. + A newly allocated IBusEngine. + Name of the IBusObject. + Path for IBusService. + An opened IBusConnection. - + Commit output of input method to IBus client. +(Note: The text object will be released, if it is floating. If caller want to keep the object, caller should make the object -sink by g_object_ref_sink.)"> +sink by g_object_ref_sink.) + String commit to IBusEngine. + Update the pre-edit buffer. +(Note: The text object will be released, if it is floating. If caller want to keep the object, caller should make the object -sink by g_object_ref_sink.)"> +sink by g_object_ref_sink.) + Update content. + Current position of cursor + Whether the pre-edit buffer is visible. + Update the pre-edit buffer with commit mode. if mode is IBUS_ENGINE_PREEDIT_CLEAR, ibus_engine_update_preedit_text_with_mode is compatible with ibus_engine_update_preedit_text. +(Note: The text object will be released, if it is floating. If caller want to keep the object, caller should make the object -sink by g_object_ref_sink.)"> +sink by g_object_ref_sink.) + Update content. + Current position of cursor + Whether the pre-edit buffer is visible. + Pre-edit commit mode when the focus is lost. + c:identifier="ibus_engine_show_preedit_text"> + Show the pre-edit buffer. + c:identifier="ibus_engine_hide_preedit_text"> + Hide the pre-edit buffer. + Update the auxiliary bar. +(Note: The text object will be released, if it is floating. If caller want to keep the object, caller should make the object -sink by g_object_ref_sink.)"> +sink by g_object_ref_sink.) + Update content. + Whether the auxiliary text bar is visible. + c:identifier="ibus_engine_show_auxiliary_text"> + Show the auxiliary bar. + c:identifier="ibus_engine_hide_auxiliary_text"> + Hide the auxiliary bar. + Update the lookup table. +(Note: The table object will be released, if it is floating. If caller want to keep the object, caller should make the object -sink by g_object_ref_sink.)"> +sink by g_object_ref_sink.) + An lookup_table. + Whether the lookup_table is visible. + Fast update for big lookup table. If size of lookup table is not over table page size *4, then it calls ibus_engine_update_lookup_table(). +(Note: The table object will be released, if it is floating. If caller want to keep the object, caller should make the object -sink by g_object_ref_sink.)"> +sink by g_object_ref_sink.) + An lookup_table. + Whether the lookup_table is visible. + c:identifier="ibus_engine_show_lookup_table"> + Show the lookup table. + c:identifier="ibus_engine_hide_lookup_table"> + Hide the lookup table. + c:identifier="ibus_engine_forward_key_event"> + Forward the key event. + KeySym. + keyboard scancode. + Key modifier flags. + Register and show properties in language bar. +(Note: The prop_list object will be released, if it is floating. If caller want to keep the object, caller should make the object -sink by g_object_ref_sink.)"> +sink by g_object_ref_sink.) + Property List. + Update the state displayed in language bar. +(Note: The prop object will be released, if it is floating. If caller want to keep the object, caller should make the object -sink by g_object_ref_sink.)"> +sink by g_object_ref_sink.) + IBusProperty to be updated. + c:identifier="ibus_engine_delete_surrounding_text"> + Delete surrounding text. + The offset of the first char. + Number of chars to be deleted. - + + Return the name of IBusEngine. + Name of IBusEngine. + transfer-ownership="none"> + Connection of this IBusEngine. + transfer-ownership="none"> + Name of this IBusEngine. @@ -3020,192 +3146,208 @@ - + Emitted when candidate on lookup table is clicked. Implement the member function candidate_clicked() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + Index of candidate be clicked. + Mouse button. + Keyboard state. - + Emitted when the down cursor button is pressed. Implement the member function cursor_down() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when the up cursor button is pressed. Implement the member function cursor_up() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when the IME is disabled. Implement the member function set_disable() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when the IME is enabled. Implement the member function set_enable() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when the client application get the focus. Implement the member function focus_in() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when the client application lost the focus. Implement the member function focus_out() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when the page-down button is pressed. Implement the member function page_down() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when the page-up button is pressed. Implement the member function page_up() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when a key event is received. Implement the member function process_key_event() in extended class to receive this signal. Both the key symbol and keycode are passed to the member function. See ibus_input_context_process_key_event() for further explanation of key symbol, keycode and which to use. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + TRUE for successfully process the key; FALSE otherwise. + Key symbol of the key press. + KeyCode of the key press. + Key modifier flags. - + Emitted when a property is activated or change changed. Implement the member function property_activate() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + Property name. + Property state. - + Emitted when a property is hidden. Implement the member function property_hide() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + Property name. - + Emitted when a property is shown. Implement the member function property_side() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + Property name. - + Emitted when the IME is reset. Implement the member function reset() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> - + Emitted when the client application capabilities is set. Implement the member function set_capabilities() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + Capabilities flags of IBusEngine, see #IBusCapabilite - + Emitted when the location of IME is set. Implement the member function set_cursor_location() in extended class to receive this signal. -<note><para>Argument @user_data is ignored in this function.</para></note>"> +<note><para>Argument @user_data is ignored in this function.</para></note> + X coordinate of the cursor. + Y coordinate of the cursor. + Width of the cursor. + Height of the cursor. @@ -3462,113 +3604,127 @@ - + Input method engine description data. + + New a IBusEngineDesc. + A newly allocated IBusEngineDesc. + Name of the engine. + Long name of the input method engine. + Input method engine description. - + + Language (e.g. zh, jp) supported by this input method engine. + License of the input method engine. + Author of the input method engine. + Icon file of this engine. + Keyboard layout - + + New a IBusEngineDesc. + A newly allocated IBusEngineDesc. + Name of the engine. + Long name of the input method engine. + Input method engine description. - + + Language (e.g. zh, jp) supported by this input method engine. + License of the input method engine. + Author of the input method engine. + Icon file of this engine. + Keyboard layout + Hotkeys for switching to this engine. + New a IBusEngineDesc from an XML node. <note><para>This function is called by ibus_component_new_from_file(), so developers normally do not need to call it directly. -</para></note>"> +</para></note> + A newly allocated IBusEngineDesc that contains description from + An XML node - + + Output XML-formatted input method engine description. +The result will be append to GString specified in @output. + XML-formatted Input method engine description. + Number of indent (showed as 4 spaces). @@ -3617,6 +3773,76 @@ + + + New an empty IBusError. + + A newly allocated IBusError. + + + + + New an IBusError from error name and message. + + A newly allocated IBusError. + + + + + The error name. + + + + Detailed error message. + + + + + + New an IBusError from error name and a printf-formatted message. + + A newly allocated IBusError. + + + + + The error name. + + + + printf() formatted error message. + + + + + + + + + + New an IBusError from a #IBusMessage. + + A newly allocated IBusError. + + + + + A DBusMessage + + + + + + Free an IBusError. + + + + + @@ -3748,34 +3974,36 @@ - + An opaque data type representing an IBusFactory. + + New an IBusFactory. + A newly allocated IBusFactory. + An IBusConnection. - + + Add an engine to the factory. + Name of an engine. + GType of an engine. @@ -3783,7 +4011,8 @@ + transfer-ownership="none"> + Connection of this IBusFactory. @@ -3841,14 +4070,14 @@ - + + Free function prototype. + object to be freed. @@ -4563,15 +4792,15 @@ - + An opaque data type representing an IBusHotkeyProfile. + + New an IBusHotkeyProfile. + A newly allocated IBusHotkeyProfile. @@ -4592,83 +4821,99 @@ + c:identifier="ibus_hotkey_profile_add_hotkey_from_string"> + Add a hotkey and its associated event to an IBusHotkeyProfile. +The hotkey is in string format, such like <constant>Control+Shift+A</constant>. + FALSE if @str contains invalid symbol; TRUE otherwise. + Key in string representation. '+' is the separator. + The event to be associated. + c:identifier="ibus_hotkey_profile_remove_hotkey"> + Remove the hotkey for an IBusHotkeyProfile. + FALSE if the key is not in @profile, TRUE otherwise. + Keycode of the hotkey. + Modifiers of the hotkey. + c:identifier="ibus_hotkey_profile_remove_hotkey_by_event"> + Remove the hotkey for an IBusHotkeyProfile by event. + FALSE if no such event in @profile, TRUE otherwise. + The associated event. + c:identifier="ibus_hotkey_profile_filter_key_event"> + Emit a <constant>::trigger</constant> signal when a hotkey is in a profile. + 0 if releasing a hotkey and the hotkey is not in the profile ; an associated event otherwise. + Keycode of the hotkey. + Modifiers of the hotkey. + Keycode of the hotkey. + Modifiers of the hotkey. + user data for signal "trigger". + c:identifier="ibus_hotkey_profile_lookup_hotkey"> + The event associated to the hotkey or 0 if the hotkey is not in the profile. + Keycode of the hotkey. + Modifiers of the hotkey. @@ -4676,18 +4921,20 @@ - + Emitted when a hotkey is pressed and the hotkey is in profile. Implement the member function trigger() in extended class to receive this signal. -<note><para>The last parameter, user_data is not actually a valid parameter. It is displayed because of GtkDoc bug.</para></note>"> +<note><para>The last parameter, user_data is not actually a valid parameter. It is displayed because of GtkDoc bug.</para></note> + An event in GQuark. + User data for callback. @@ -4730,32 +4977,36 @@ - + + Prototype of an IBusIBusMessage callback function. + TRUE if succeed; FALSE otherwise. + An IBusConnection. + An IBusMessage. - + + Prototype of an IBusIBusSignal callback function. + TRUE if succeed; FALSE otherwise. + An IBusConnection. + An IBusMessage. @@ -4932,48 +5183,53 @@ - + An opaque data type representing an IBusInputContext. + + New an IBusInputContext. + A newly allocated IBusInputContext. + The path to the object that emitting the signal. + An IBusConnection. + c:identifier="ibus_input_context_get_input_context"> + Gets an existing IBusInputContext. + An existing IBusInputContext. + The path to the object that emitting the signal. + An IBusConnection. + Pass the key event to input method engine. Key symbols are characters/symbols produced by key press, for example, -pressing "s" generates key symbol "s"; pressing shift-"s" generates key symbol "S". +pressing "s" generates key symbol "s"; pressing shift-"s" generates key symbol "S". Same key on keyboard may produce different key symbols on different keyboard layout. -e.g., "s" key on QWERTY keyboard produces "o" in DVORAK layout. +e.g., "s" key on QWERTY keyboard produces "o" in DVORAK layout. Unlike key symbol, keycode is only determined by the location of the key, and irrelevant of the keyboard layout. Briefly speaking, input methods that expect certain keyboard layout should use @@ -4981,51 +5237,60 @@ For example, Chewing, Cangjie, Wubi expect an en-US QWERTY keyboard, these should use keycode; while pinyin can rely on keyval only, as it is less sensitive to the keyboard layout change, DVORAK users can still use DVORAK layout to input pinyin. -Use ibus_keymap_lookup_keysym() to convert keycode to keysym in given keyboard layout."> +Use ibus_keymap_lookup_keysym() to convert keycode to keysym in given keyboard layout. + TRUE for successfully process the key; FALSE otherwise. + Key symbol of a key event. + Keycode of a key event. + Key modifier flags. + c:identifier="ibus_input_context_set_cursor_location"> + Set the cursor location of IBus input context. + X coordinate of the cursor. + Y coordinate of the cursor. + Width of the cursor. + Height of the cursor. + c:identifier="ibus_input_context_set_capabilities"> + Set the capabilities flags of client application. + Capabilities flags of IBusEngine, see #IBusCapabilite @@ -5044,63 +5309,58 @@ - + + Invoked when the client application get focus. - + + Invoked when the client application get focus. - + + Invoked when the IME is reset. - + + Invoked when the IME is enabled, either by IME switch hotkey or select from the menu. - + + Invoked when the IME is disabled, either by IME switch hotkey or select from the menu. - + + Returns TRUE if the IME is enabled on the context. + TRUE if the IME is enabled on the context. - + + Returns an IME engine description for the context. + An IME engine description for the context - + + Invoked when the IME engine is changed. + A name of the engine. @@ -5108,138 +5368,149 @@ - + Emitted when the text is going to be committed. +(Note: The text object is floating, and it will be released after the signal. If singal handler want to keep the object, the handler should use g_object_ref_sink() -to get the ownership of the object.)"> +to get the ownership of the object.) + Text to be committed. - + + Emitted to select next candidate of lookup table. - + + Emitted to select previous candidate of lookup table. - + + Emitted to delete surrounding text event from IME to client of IME. + the character offset from the cursor position of the text to be deleted. A negative value indicates a position before the cursor. + the number of characters to be deleted. - + + Emitted when an IME is disabled. - + + Emitted when an IME is enabled. - + + Emitted to forward key event from IME to client of IME. + Key symbol of the keyboard event. + Key symbol of the keyboard event. + Key modifier flags. - + + Emitted to hide auxiliary text. - + + Emitted to hide lookup table. - + + Emitted to hide preedit text. - + + Emitted to view the next page of lookup table. - + + Emitted to view the previous page of lookup table. - + Emitted to register the properties in @props. +(Note: The props object is floating, and it will be released after the signal. If singal handler want to keep the object, the handler should use g_object_ref_sink() -to get the ownership of the object.)"> +to get the ownership of the object.) + An IBusPropList that contains properties. - + + Emitted to show auxiliary text. - + + Emitted to show lookup table. - + + Emitted to show preedit text. - + Emitted to hide auxilary text. +(Note: The text object is floating, and it will be released after the signal. If singal handler want to keep the object, the handler should use g_object_ref_sink() -to get the ownership of the object.)"> +to get the ownership of the object.) @@ -5252,50 +5523,59 @@ - + Emitted to update lookup table. +(Note: The table object is floating, and it will be released after the signal. If singal handler want to keep the object, the handler should use g_object_ref_sink() -to get the ownership of the object.)"> +to get the ownership of the object.) + An IBusLookupTable to be updated. + Whether the table should be visible. - + Emitted to update preedit text. +(Note: The text object is floating, and it will be released after the signal. If singal handler want to keep the object, the handler should use g_object_ref_sink() -to get the ownership of the object.)"> +to get the ownership of the object.) + Text to be updated. + Cursor position. + Whether the update is visible. - + Emitted to update the property @prop. +(Note: The prop object is floating, and it will be released after the signal. If singal handler want to keep the object, the handler should use g_object_ref_sink() -to get the ownership of the object.)"> +to get the ownership of the object.) + The IBusProperty to be updated. @@ -5462,52 +5742,57 @@ + A keymap object in IBus. + Get an IBusKeymap associated with the giving name. This function loads the keymap file specified in @name in the IBUS_DATA_DIR/keymaps directory. -not be used in newly written code. Please use ibus_keymap_get()." - deprecated="This function has been deprecated and should"> +not be used in newly written code. Please use ibus_keymap_get(). + An IBusKeymap associated with the giving name; or NULL if failed. + The keymap file to be loaded, such as 'us', 'jp'. - + Get an IBusKeymap associated with the giving name. This function loads the keymap file specified in @name -in the IBUS_DATA_DIR/keymaps directory."> +in the IBUS_DATA_DIR/keymaps directory. + An IBusKeymap associated with the giving name; or NULL if failed. + The keymap file to be loaded, such as 'us', 'jp'. - + + Convert the scancode to keysym, given the keymap. + Corresponding keysym. + A scancode to be converted. + Modifier flags(such as Ctrl, Shift). @@ -5593,258 +5878,275 @@ - + An IBusLookuptable stores the candidate words or phrases for users to choose from. +Note that some input methods allow you to select candidate by pressing non-numeric +keys such as "asdfghjkl;". +Developers of these input methods should change the labels with +ibus_lookup_table_append_label(). + + New a IBusLookupTable. + A newly allocated IBusLookupTable. + number of candidate shown per page, the max value is 16. + position index of cursor. + whether the cursor is visible. + TRUE for lookup table wrap around. + c:identifier="ibus_lookup_table_append_candidate"> + Append a candidate word/phrase to IBusLookupTable, and increase reference. + candidate word/phrase to be appended (in IBusText format). + c:identifier="ibus_lookup_table_get_number_of_candidates"> + Return the number of candidate in the table. + The number of candidates in the table - + c:identifier="ibus_lookup_table_get_candidate"> + Return IBusText at the given index. Borrowed reference. + + IBusText at the given index; NULL if no such IBusText. + Index in the Lookup table. + Append a candidate word/phrase to IBusLookupTable, and increase reference. This function is needed if the input method select candidate with -non-numeric keys such as "asdfghjkl;"."> +non-numeric keys such as "asdfghjkl;". + A candidate label to be appended (in IBusText format). - + Append a candidate word/phrase to IBusLookupTable, and increase reference. This function is needed if the input method select candidate with -non-numeric keys such as "asdfghjkl;"."> +non-numeric keys such as "asdfghjkl;". + Intex in the Lookup table. + A candidate label to be appended (in IBusText format). - - + + Return IBusText at the given index. Borrowed reference. + + IBusText at the given index; NULL if no such IBusText. + Index in the Lookup table. + c:identifier="ibus_lookup_table_set_cursor_pos"> + Set the cursor position of IBusLookupTable. + The position of cursor. + c:identifier="ibus_lookup_table_get_cursor_pos"> + Get the cursor position of IBusLookupTable. + The position of cursor. + c:identifier="ibus_lookup_table_set_cursor_visible"> + Set whether to make the cursor of an IBusLookupTable visible or not. + Whether to make the cursor of @table visible. + c:identifier="ibus_lookup_table_is_cursor_visible"> + Returns whether the cursor of an IBusLookupTable is visible. + Whether the cursor of @table is visible. + c:identifier="ibus_lookup_table_get_cursor_in_page"> + Get the cursor position in current page of IBusLookupTable. + The position of cursor in current page. + c:identifier="ibus_lookup_table_set_page_size"> + Set the number of candidate shown per page. + number of candidate shown per page. + c:identifier="ibus_lookup_table_get_page_size"> + Get the number of candidate shown per page. + Page size, i.e., number of candidate shown per page. - + + Set whether to make the IBusLookupTable round or not. + Whether to make @table round. - + + Returns whether the IBusLookupTable is round. + Whether the @table is round. + c:identifier="ibus_lookup_table_set_orientation"> + Set the orientation. + . + c:identifier="ibus_lookup_table_get_orientation"> + Returns the orientation of the IBusLookupTable. + The orientation of the @table. - + + Clear and remove all candidate from an IBusLookupTable. - + Go to previous page of an IBusLookupTable. It returns FALSE if it is already at the first page, unless <code>table&gt;-round==TRUE</code>, where it will go -to the last page."> +to the last page. + TRUE if succeed. - + Go to next page of an IBusLookupTable. It returns FALSE if it is already at the last page, unless <code>table&gt;-round==TRUE</code>, where it will go -to the first page."> +to the first page. + TRUE if succeed. - + Go to previous candidate of an IBusLookupTable. It returns FALSE if it is already at the first candidate, unless <code>table&gt;-round==TRUE</code>, where it will go -to the last candidate."> +to the last candidate. + TRUE if succeed. - + Go to next candidate of an IBusLookupTable. It returns FALSE if it is already at the last candidate, unless <code>table&gt;-round==TRUE</code>, where it will go -to the first candidate."> +to the first candidate. + TRUE if succeed. @@ -5889,7 +6191,7 @@ - + @@ -5925,6648 +6227,6767 @@ - - - - - - - - - + + + New an IBusMessage. +Valid D-Bus message types include: +<itemizedlist> +<listitem> +<para>#DBUS_MESSAGE_TYPE_METHOD_CALL</para> +</listitem> +<listitem> +<para>#DBUS_MESSAGE_TYPE_METHOD_RETURN</para> +</listitem> +<listitem> +<para>#DBUS_MESSAGE_TYPE_ERROR</para> +</listitem> +<listitem> +<para>#DBUS_MESSAGE_TYPE_SIGNAL</para> +</listitem> +</itemizedlist> +These are defined in dbus-protocol.h in D-Bus. + + A newly allocated IBusMessage according to @message_type. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Type of the message. + + + + + + Constructs a new message to invoke a method on a remote object. +The destination may be %NULL in which case no destination is set; +this is appropriate when using IBus/D-Bus in a peer-to-peer context (no message bus). +The interface may be %NULL, which means that if multiple methods with the given name +exist it is undefined which one will be invoked. +The path and method names may not be %NULL. +Destination, path, interface, and method name can't contain any invalid characters +(see the D-Bus specification). - + A newly allocate IBusMessage; or %NULL if memory cannot be allocated. + + + + Where this message to be sent to or %NULL for no destination. + + + + Object path the message should be sent to. + + + + Interface to invoke method on, or %NULL. + + + + The method to be invoked. + + + - - - + + Constructs a message that is a reply to a method call. + + A newly allocate IBusMessage; or %NULL if memory cannot be allocated. + - - - - - - - - + + + The IBusMessage being replied to. + + + + + + Creates a new message that is an error reply to another message. +Error replies are most common in response to method calls, but can be returned in reply to any message. +The error name must be a valid error name according to the syntax given in the D-Bus specification. +If you don't want to make up an error name just use %DBUS_ERROR_FAILED. +Use ibus_message_unref() to free the produced IBusMessage. - + A newly allocate IBusMessage with the error information; or %NULL if memory cannot be allocated. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + The IBusMessage being replied to. + + + + Name of the error. + + + + Detailed error message string (or %NULL for none, but please give a message). + + + + + + Creates a new message that is an error reply to another message. +Error replies are most common in response to method calls, but can be returned in reply to any message. +The error name must be a valid error name according to the syntax given in the D-Bus specification. +If you don't want to make up an error name just use %DBUS_ERROR_FAILED. - + A newly allocate IBusMessage with the error information; or %NULL if memory cannot be allocated. + - - + + The IBusMessage being replied to. + - - + + Name of the error. + + + + Error format string as in printf() format. + + + + + - + + Constructs a new message representing a signal emission. +Returns NULL if memory can't be allocated for the message. +A signal is identified by its originating object path, interface, and the name of the signal. +Path, interface, and signal name must all be valid (the D-Bus specification defines the syntax of these fields). - + A newly allocate IBusMessage with the error information; or %NULL if memory cannot be allocated. + + Object path the message should be sent to. - - + + Interface to invoke method on, or %NULL. + + + + The method to invoke. + - - - - - + + Increments the reference count of an IBusMessage. + + The IBusMessage. + - + + Decrements the reference count of a DBusMessage, freeing the message if the count reaches 0. + + + + + + Checks whether the message is a method call with the given interface and member fields. +If the message is not DBUS_MESSAGE_TYPE_METHOD_CALL, +or has a different interface or member field, returns FALSE. +If the interface field is missing, then it will be assumed equal to the provided interface. +The D-Bus protocol allows method callers to leave out the interface name. + %TRUE if @message is DBUS_MESSAGE_TYPE_METHOD_CALL and the invoked method is matched with @method; %FALSE otherwise. + + + The interface to check. Cannot be %NULL. + + + + The method to check. Cannot be %NULL. + + + - + + Checks whether the message is an error reply with the given error name. +If the message is not DBUS_MESSAGE_TYPE_ERROR, or has a different name, returns FALSE. - + %TRUE if @message is DBUS_MESSAGE_TYPE_ERROR and the error name is matched with @error_name; %FALSE otherwise. + - - + + Name of the error to check. + - - + + + + Checks whether the message is a signal with the given interface and member fields. +If the message is not %DBUS_MESSAGE_TYPE_SIGNAL, or has a different interface or member field, returns %FALSE. + + %TRUE if @message is %DBUS_MESSAGE_SIGNAL and the signal name is matched with @signal_name; %FALSE otherwise. + + + + + The interface to checked. Cannot be %NULL. + + + + The signal name to check. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Sets the message's destination. +The destination is the name of another connection on the bus +and may be either the unique name assigned by the bus to each connection, +or a well-known name specified in advance. +The destination name must contain only valid characters as defined in the D-Bus specification. + %TRUE if succeed; %FALSE if insufficient memory. - + + Destination to set; or %NULL to unset. - - - - - + + + Sets the message sender. +The sender must be a valid bus name as defined in the D-Bus specification. +Usually you don't want to call this. The message bus daemon will call it to set the origin of each message. +If you aren't implementing a message bus daemon you shouldn't need to set the sender. + %TRUE if succeed; %FALSE if insufficient memory. - + + Sender to set; or %NULL to unset. - - - - - + + + Sets the name of the error (%DBUS_MESSAGE_TYPE_ERROR). +The name is fully-qualified (namespaced). +The error name must contain only valid characters as defined in the D-Bus specification. + %TRUE if succeed; %FALSE if insufficient memory. - - - - - + + Error name to set; or %NULL to unset. + - - + + + Sets the interface this message is being sent to +(for %DBUS_MESSAGE_TYPE_METHOD_CALL) or the interface +a signal is being emitted from (for %DBUS_MESSAGE_TYPE_SIGNAL). +The interface name must contain only valid characters as defined in the D-Bus specification. + %TRUE if succeed; %FALSE if insufficient memory. - - - - - - - - - - - - - - + + Interface to set; or %NULL to unset. + - - + + + Sets the interface member being invoked (%DBUS_MESSAGE_TYPE_METHOD_CALL) +or emitted (%DBUS_MESSAGE_TYPE_SIGNAL). +The member name must contain only valid characters as defined in the D-Bus specification. + %TRUE if succeed; %FALSE if insufficient memory. - - - - - - - - + + Member to set; or %NULL to unset. + - - + + + Sets the object path this message is being sent to (for $DBUS_MESSAGE_TYPE_METHOD_CALL) +or the one a signal is being emitted from (for %DBUS_MESSAGE_TYPE_SIGNAL). +The path must contain only valid characters as defined in the D-Bus specification. + %TRUE if succeed; %FALSE if insufficient memory. - - - - - - - - + + Path to set; or %NULL to unset. + - - + + + Sets a flag indicating that the message does not want a reply; +if this flag is set, the other end of the connection may (but is not required to) +optimize by not sending method return or error replies. +If this flag is set, there is no way to know whether the message successfully arrived +at the remote end. +Normally you know a message was received when you receive the reply to it. +The flag is FALSE by default, that is by default the other end is required to reply. +On the protocol level this toggles %DBUS_HEADER_FLAG_NO_REPLY_EXPECTED. - + - - - - - - - + + %TRUE if no reply is desired. - - - - - + + + Sets the reply serial of a message (the serial of the message this is a reply to). + %TRUE if succeed; %FALSE if insufficient memory. - - - - - + + The serial to be replied. + - - + + + Gets the destination of a message or %NULL if there is none set. +The returned string becomes invalid if the message is modified, +since it points into the wire-marshaled message data. - + Destination of the IBusMessage; NULL if there is none set. + - - - - - - - + + + Gets the unique name of the connection which originated this message, +or %NULL if unknown or inapplicable. +The sender is filled in by the message bus. +Note, the returned sender is always the unique bus name. +Connections may own multiple other bus names, but those are not found in the sender field. +The returned string becomes invalid if the message is modified, +since it points into the wire-marshaled message data. - + Sender of the IBusMessage; %NULL if unknown or inapplicable. + - - - - - - - + + + Gets the error name (%DBUS_MESSAGE_TYPE_ERROR only) or %NULL if none. +The returned string becomes invalid if the message is modified, +since it points into the wire-marshaled message data. - + Error name of the IBusMessage; %NULL if none. + - - - - - - - + + + Gets the error message (%DBUS_MESSAGE_TYPE_ERROR only) or %NULL if none. +The returned string becomes invalid if the message is modified, +since it points into the wire-marshaled message data. - + Error message of the IBusMessage; %NULL if none. + - - - - - - - + + + Gets the interface this message is being sent to (for %DBUS_MESSAGE_TYPE_METHOD_CALL) +or being emitted from (for %DBUS_MESSAGE_TYPE_SIGNAL). +The interface name is fully-qualified (namespaced). Returns %NULL if none. +The returned string becomes invalid if the message is modified, +since it points into the wire-marshaled message data. - + Interface name of the IBusMessage; %NULL if none. + - - - - - - - + + + Gets the interface member being invoked (%DBUS_MESSAGE_TYPE_METHOD_CALL) +or emitted (%DBUS_MESSAGE_TYPE_SIGNAL). +Returns %NULL if none. +The returned string becomes invalid if the message is modified, +since it points into the wire-marshaled message data. + + Member name of the IBusMessage; %NULL if none. + + + + + Gets the object path this message is being sent to (for %DBUS_MESSAGE_TYPE_METHOD_CALL) +or being emitted from (for %DBUS_MESSAGE_TYPE_SIGNAL). +Returns %NULL if none. +See also dbus_message_get_path_decomposed(). +The returned string becomes invalid if the message is modified, +since it points into the wire-marshaled message data. + + Object path of the IBusMessage; %NULL if none. + + + + + Returns TRUE if the message does not expect a reply. + %TRUE if the message does not expect a reply; %FALSE otherwise. - - - - - - - + + + Returns the serial that the message is a reply to or 0 if none. + + The serial that the message is a reply to or 0 if none. + + + + + Returns the serial of a message or 0 if none has been specified. +The message's serial number is provided by the application sending the message +and is used to identify replies to this message. +All messages received on a connection will have a serial provided by the remote application. +For messages you're sending, dbus_connection_send() will assign a serial and return it to you. + + The serial of a message or 0 if none has been specified. + + + + + Appends fields to a message given a variable argument list. +The variable argument list should contain the type of each argument followed by the value to append. +Appendable types are basic types, and arrays of fixed-length basic types. +To append variable-length basic types, or any more complex value, +you have to use an iterator rather than this function. +To append a basic type, specify its type code followed by the address of the value. For example: +<informalexample> +<programlisting> +dbus_int32_t v_INT32 = 42; +const char *v_STRING = "Hello World"; +dbus_message_append_args (message, +DBUS_TYPE_INT32, &v_INT32, +DBUS_TYPE_STRING, &v_STRING, +DBUS_TYPE_INVALID); +</programlisting> +</informalexample> +To append an array of fixed-length basic types, pass in the %DBUS_TYPE_ARRAY typecode, +the element typecode, the address of the array pointer, +and a 32-bit integer giving the number of elements in the array. So for example: +<informalexample> +<programlisting> +const dbus_int32_t array[] = { 1, 2, 3 }; +const dbus_int32_t *v_ARRAY = array; +dbus_message_append_args (message, +DBUS_TYPE_ARRAY, DBUS_TYPE_INT32, &v_ARRAY, 3, +DBUS_TYPE_INVALID); +</programlisting> +</informalexample> +<note><para> +in C, given "int array[]", "&array == array" (the comp.lang.c FAQ says otherwise, but gcc and the FAQ don't agree). +So if you're using an array instead of a pointer you have to create a pointer variable, +assign the array to it, then take the address of the pointer variable. +For strings it works to write const char *array = "Hello" and then use &amp;array though. +</para></note> +The last argument to this function must be %DBUS_TYPE_INVALID, marking the end of the argument list. +If you don't do this then libdbus won't know to stop and will read invalid memory. +String/signature/path arrays should be passed in as "const char*** address_of_array" and "int n_elements" + %TRUE if succeed; %FALSE otherwise. - - + + Type of the first argument. + + + + + - - + + + Gets arguments from a message given a variable argument list. +The supported types include those supported by ibus_message_append_args(); +that is, basic types and arrays of fixed-length basic types. +The arguments are the same as they would be for ibus_message_iter_get_basic() +or ibus_message_iter_get_fixed_array(). +In addition to those types, arrays of string, object path, and signature are supported; +but these are returned as allocated memory and must be freed with dbus_free_string_array(), +while the other types are returned as const references. +To get a string array pass in "char ***array_location" and "int *n_elements". +The variable argument list should contain the type of the argument followed by a pointer to +where the value should be stored. The list is terminated with %DBUS_TYPE_INVALID. +Except for string arrays, the returned values are constant; do not free them. +They point into the IBusMessage. +If the requested arguments are not present, or do not have the requested types, then an error will be set. +If more arguments than requested are present, +the requested arguments are returned and the extra arguments are ignored. + %TRUE if succeed; F%ALSE otherwise. + Error to be filled in on failure. + + Type of the first argument. + + + + + + - - + + + Initializes a #IBusMessageIter for appending arguments to the end of a message. - + - - + + An IBusMessageIter to to initialize. + - - + + + Initializes an #IBusMessageIter for reading the arguments of the message passed in. +When possible, ibus_message_get_args() is much more convenient. +Some types of argument can only be read with IBusMessageIter however. +The easiest way to iterate is like this: +<informalexample> +<programlisting> +dbus_message_iter_init (&iter); +while ((current_type = dbus_message_iter_get_arg_type (&iter)) != DBUS_TYPE_INVALID) +dbus_message_iter_next (&iter); +</programlisting> +</informalexample> +IBusMessageIter contains no allocated memory; +it need not be freed, and can be copied by assignment or memcpy(). + %TRUE if succeed; %FALSE if the message has no arguments. - - + + An IBusMessageIter. + - - + + + Produces a pretty formatted string which show the information of the IBusMessage. +This string is suitable for debugging information print out. +Free the string by g_free() after use. + + A string which shows the information of the message. + + + + + + Prototype of an IBusMessage callback function. + + TRUE if succeed; FALSE otherwise. + + + + + An IBusConnection. + + + + An IBusMessage. + + + + User data for the callback function. + + + + + + + Appends a basic-typed value to the message. +The basic types are the non-container types such as integer and string. +The "value" argument should be the address of a basic-typed value. +So for string, const char**. For integer, dbus_int32_t*. + %TRUE if succeed; %FALSE if insufficient memory. - - + + The type of the value. + + + + The pointer to the value. + - - + + + Deep copy an IBusMessageIter to another IBusMessageIter. + %TRUE if succeed; %FALSE if failed. - - + + Source to be copy from. + - - + + + Reads a basic-typed value from the message iterator. +Basic types are the non-containers such as integer and string. +The value argument should be the address of a location to store the returned value. +So for int32 it should be a "dbus_int32_t*" and for string a "const char**". +The returned value is by reference and should not be freed. +Be sure you have somehow checked that dbus_message_iter_get_arg_type() matches the type you are expecting, +or you'll crash when you try to use an integer as a string or something. +To read any container type (array, struct, dict) you will need to recurse into the container with +dbus_message_iter_recurse(). +If the container is an array of fixed-length values, +you can get all the array elements at once with dbus_message_iter_get_fixed_array(). +Otherwise, you have to iterate over the container's contents one value at a time. +All basic-typed values are guaranteed to fit in 8 bytes. So you can write code like this: +<informalexample> +<programlisting> +dbus_uint64_t value; +int type; +dbus_message_iter_get_basic (&read_iter, &value); +type = dbus_message_iter_get_arg_type (&read_iter); +dbus_message_iter_append_basic (&write_iter, type, &value); +</programlisting> +</informalexample> +On some really obscure platforms dbus_uint64_t might not exist, +if you need to worry about this you will know. +dbus_uint64_t is just one example of a type that's large enough to hold any possible value, +you could use a struct or char[8] instead if you like. - + - - + + Result value stores here. Cannot be %NULL. + - - + + + Gets an value from an IBusMessageIter, then move on to the next element. + %TRUE if succeed; %FALSE if insufficient memory. - - + + The type of the value. Cannot be %NULL. + + + + Result value stores here. Cannot be %NULL. + - - + + + Moves the iterator to the next field, if any. +If there's no next field, returns %FALSE. If the iterator moves forward, returns %TRUE. + %TRUE if the iterator moves forward successfully; %FALSE if next element does not exist. - - - - - - - + + + Checks if an iterator has any more fields. + %TRUE if next element exists; %FALSE otherwise. - - - - - - - + + + Appends a container-typed value to the message; +you are required to append the contents of the container using the returned sub-iterator, +and then call dbus_message_iter_close_container(). +Container types are for example struct, variant, and array. +For variants, the contained_signature should be the type of the single value inside the variant. +For structs and dict entries, contained_signature should be %NULL; +it will be set to whatever types you write into the struct. +For arrays, contained_signature should be the type of the array elements. - + %TRUE if succeed; %FALSE if insufficient memory. + - - + + The type of the value. + - - + + The type of container contents. + - - + + Sub-iterator to initialize. + - - - - - - - - - - - - - - - - + + Closes a container-typed value appended to the message; +may write out more information to the message known only after the entire container is written, +and may free resources created by dbus_message_iter_open_container(). - + %TRUE if succeed; %FALSE if insufficient memory. + + + + Sub-iterator to close. + + + - + + Recurses into a container value when reading values from a message, +initializing a sub-iterator to use for traversing the child values of the container. +Note that this recurses into a value, not a type, so you can only recurse if the value exists. +The main implication of this is that if you have for example an empty array of array of int32, +you can recurse into the outermost array, but it will have no values, so you won't be able to recurse further. +There's no array of int32 to recurse into. +If a container is an array of fixed-length types, it is much more efficient to use +dbus_message_iter_get_fixed_array() to get the whole array in one shot, +rather than individually walking over the array elements. +Be sure you have somehow checked that dbus_message_iter_get_arg_type() +matches the type you are expecting to recurse into. +Results of this function are undefined if there is no container to recurse into at the current iterator position. - + %TRUE if succeed; %FALSE if insufficient memory. + - - + + The type of the value. + - - + + Sub-iterator to initialize. + - + + Returns the argument type of the argument that the message iterator points to. +If the iterator is at the end of the message, returns %DBUS_TYPE_INVALID. +You can thus write a loop as follows: +<informalexample> +<programlisting> +dbus_message_iter_init (&iter); +while ((current_type = dbus_message_iter_get_arg_type (&iter)) != DBUS_TYPE_INVALID) +dbus_message_iter_next (&iter); +</programlisting> +</informalexample> - + The argument type. + - - - - - - + + Returns the element type of the array that the message iterator points to. +Note that you need to check that the iterator points to an array prior to using this function. - + The argument type. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Handles key modifier such as control, shift and alt and release event. +Note that nits 15 - 25 are currently unused, while bit 29 is used internally. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prototype of new connection callback function. +This callback should be connected to signal ::new-connection +to handle the event that a new connection is coming in. +In this handler, IBus could add a reference and continue processing the connection. +If no reference is added, the new connection will be released and closed after this signal. + + + + + + An IBusServer. + + + + The corresponding IBusConnection. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + All the fields in the <structname>IBusObject</structname> structure are +private to the #IBusObject and should never be accessed directly. + + New an IBusObject. + + A newly allocated IBusObject + + + + + Emit the "destory" signal notifying all reference holders that they should +release the #IBusObject. +The memory for the object itself won't be deleted until its reference count +actually drops to 0; ibus_object_destroy merely asks reference holders to +release their references. It does not free the object. + + + + + + - - - - - - - - - - - - - - + + - - + + Destroy and free an IBusObject +<note><para>Argument @user_data is ignored in this function.</para></note> + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + Data structure of IBusObservedPath. + + New an IBusObservedPath from an XML node. + + A newly allocated IBusObservedPath. + + + + + An XML node that contain path. + + + + Auto-fill the path status. + + + + + + New an IBusObservedPath from an XML node. + + A newly allocated IBusObservedPath. + + + + + The path string. + + + + Auto-fill the path status. + + + + + + Recursively traverse the path and put the files and subdirectory in to a newly allocated +GLists, if the @path is a directory. Otherwise returns NULL. + + A newly allocate GList which holds content in path; NULL if @path is not directory. + + + + + + + Checks whether the path is modified by comparing the mtime in object and mtime in file system. +Returns TRUE if imtime is changed, otherwise FALSE. + + TRUE if mtime is changed; FALSE otherwise. + + + + + Append the observed path to a string with following format: +&lt;path mtime="&lt;i&gt;modified time&lt;/i&gt;" &gt;&lt;i&gt;path&lt;/i&gt;&lt;/path&gt; + + + + + + Path is appended to. + + + + number of indent. + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + Orientation of UI. + - + + c:identifier="IBUS_ORIENTATION_VERTICAL" + glib:nick="vertical"/> + - + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + An opaque data type representing an IBusPanelService. + + New an IBusPanelService from an IBusConnection. - + A newly allocated IBusPanelService. + + + + An IBusConnection. + + + - + - + - - + + + + + - - - - + + + + - - + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + - - + + - - + + - - + + - + + + + + + + + + + + - + + + + + + + + + + + + + + - - - - - + + - - + + - + - + + + + + + + + + + - - + + - + - - + + + + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + - - + + - - + + - + - - + + - - + + - - - - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + - - - - - + + - - + + + + + + + + + - - - - + + + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + transfer-ownership="none"> + Connection of this IBusPanelService. - - - - - - - - - - + - - - - - - - - - - - + - + - - + + - - + + - - + + + + + - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Increases the reference count on a pending call. - + A reference of IBusPendingCall. + - - + + + Decreases the reference count on a pending call. + + + + + + Sets a notification function to be called when the reply is received or the pending call times out. + TRUE if succeed; FALSE if not enough memory. - - + + An pending call notify callback function. + + + + User data for the callback function. + + + + Callback to free the user_data. + - + + Cancels the pending call, such that any reply or error received will just be ignored. +Drops the dbus library's internal reference to the DBusPendingCall so will free the call +if nobody else is holding a reference. +But usually application owns a reference from dbus_connection_send_with_reply(). +Note that canceling a pending call will not simulate a timed-out call; +if a call times out, then a timeout error reply is received. +If you cancel the call, no reply is received unless the reply was already received before you canceled. - + + Whether the pending call has received a reply or not. - + TRUE if pending call has received a reply; FALSE otherwise. + - + + Gets the reply, or returns NULL if none has been received yet. +Ownership of the reply message passes to the caller. +This function can only be called once per pending call, +since the reply message is transferred to the caller. + + Replied message; NULL if none has been received yet. + + + + + Block until the pending call is completed. +The blocking is as with ibus_connection_send_with_reply_and_block(); +it does not enter the main loop or process other messages, +it simply waits for the reply in question. +If the pending call is already completed, this function returns immediately. - + - + + Wait until the pending call is completed. - + - + + Stores a pointer on a IBusPendingCall, along with an optional function +to be used for freeing the data when the data is set again, or when the pending call is finalized. +The slot number must have been allocated with ibus_pending_call_allocate_data_slot(). + TRUE if there was enough memory to store the data; FALSE otherwise. - - - - + + The slot number. + + + + The data to store + + + + Callback to free the data. + - - - - - - - - - + + Retrieves data previously set with ibus_pending_call_set_data(). +The slot must still be allocated (must not have been freed). + + The stored data; NULL if no such data. + - - + + The slot number. + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + Callback prototype of pending call notify function. + + + + + + An IBusPendingCall. + + + + User data for the callback function. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pre-edit commit mode when the focus is lost. + + + + + + + + + + + + + + + + + An array of IBusProperties. + + New a IBusPropList. - + A newly allocated IBusPropList. + - - - - - - - - - - - - - - - - - - - + + Append an IBusProperty to an IBusPropList, and increase reference. - + - - - - - + + IBusProperty to be append to @prop_list. + - - - - - - + + Returns IBusProperty at given index. Borrowed reference. - + IBusProperty at given index, NULL if no such IBusProperty. + - - - - - + + Index of an IBusPropList. + - + + Update an IBusProperty in IBusPropList. + TRUE if succeeded, FALSE otherwise. - - + + IBusProperty to be update. + - - - - - - - - - - - + + + + + + + + + + + + + + State of IBusProperty. The actual effect depends on #IBusPropType of the +IBusProperty. +<variablelist> +<varlistentry> +<term>PROP_TYPE_TOGGLE</term> +<listitem><para>Emphasized if PROP_STATE_CHECKED, normal otherwise.</para></listitem> +</varlistentry> +<varlistentry> +<term>PROP_TYPE_RADIO</term> +<listitem><para>Option checked if PROP_STATE_CHECKED, unchecked otherwise.</para></listitem> +</varlistentry> +</variablelist> +No effect on other types. + + + + + + Type enumeration of IBusProperty. + + + + + + + + UI component for input method engine property. + + New a IBusProperty. + + A newly allocated IBusProperty. + + - - + + Unique Identity for the IBusProperty. + + + + IBusPropType of IBusProperty. + + + + Text shown in UI. + + + + Icon file for the IBusProperty. + + + + Message shown if mouse hovered the IBusProperty. + + + + Whether the IBusProperty is sensitive to keyboard and mouse event. + + + + Whether the IBusProperty is visible. + + + + IBusPropState of IBusProperty. + + + + IBusPropList that contains sub IBusProperties. + - - + + + Set the label of IBusProperty. - + + + + Text shown in UI. + + + - + + Set the icon of IBusProperty. - + - + + Icon shown in UI. It could be a full path of an icon file or an icon name. - - + + + + Set the tooltip of IBusProperty. + + + + + + Text of the tooltip. + - - + + + + Set whether the IBusProperty is sensitive. + + + + + + Whether the IBusProperty is sensitive. + - - - + + + + Set whether the IBusProperty is visible. + + + + + + Whether the IBusProperty is visible. + - - - - - - - - - + + Set the state of the IBusProperty. + + - - + + The state of the IBusProperty. + - - + + + + Set the sub IBusProperties. + + + + + + IBusPropList that contains sub IBusProperties. + - - - + + + Update the content of an IBusProperty. +IBusProperty @prop_update can either be sub-property of @prop, +or holds new values for @prop. + + TRUE for update suceeded; FALSE otherwise. - - - - - + + IBusPropList that contains sub IBusProperties. + - - - + - + - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - + + - - - - + + - - - + + + + - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + An opaque data type representing an IBusProxy. + + New an IBusProxy instance. +Property IBusProxy:name is set as @name, and +IBusProxy:path is set as @path. - + A newly allocated IBusProxy instance. + - + + The service name of proxy object. + + The path of proxy object. + + + + An IBusConnection. + + - - - + + + - - + + - - - - + + + Send an #IBusMessage to the corresponding service. + + TRUE if succeed; FALSE otherwise. + - + + The IBusMessage to be sent. + + + + + + Call a method of the corresponding service. + + TRUE if succeed; FALSE otherwise. + + + + + The method to be called. + + Type of first argument. + + + + + + - - - - + + + Call a method of the corresponding service, and returns an IBusPendingCall used to receive a reply to the message. +This function calls ibus_connection_send_with_reply() to do the actual sending. +ibus_proxy_send_with_reply(), ibus_proxy_call_with_reply_and_block(). + + TRUE if succeed; FALSE otherwise. + - + + The method to be called. + + Return location of a IBusPendingCall object, or NULL if connection is disconnected. + + + + Time out in milliseconds. + + + + Returned error is stored here; NULL to ignore error. + + + + Type of first argument. + + - - + + + Call a method of the corresponding service and blocks a certain time period while waiting for +an IBusMessage as reply. +If the IBusMessage is not NULL, it calls ibus_connection_send_with_reply_and_block() to do the +actual sending. +ibus_proxy_send_with_reply(), ibus_proxy_call_with_reply_and_block(). - + An IBusMessage that is the reply or NULL with an error code if the function fails. + - - + + The method to be called. + + + + Time out in milliseconds. + + + + Returned error is stored here; NULL to ignore error. + + + + Type of first argument. + + + + + - - + + + Send an IBusMessage to the corresponding service and returns +an IBusPendingCall used to receive a reply to the message. +This function calls ibus_connection_send_with_reply() to do the actual sending. +ibus_proxy_call_with_reply(), ibus_proxy_send_with_reply_and_block(). - + TRUE if succeed; FALSE otherwise. + - - - - - + + The IBusMessage to be sent. + - - + + Return location of a IBusPendingCall object, or NULL if connection is disconnected. + - + + Time out in milliseconds. - + + Send an IBusMessage to the corresponding service and blocks a certain time period while waiting for +an IBusMessage as reply. +If the IBusMessage is not NULL, it calls ibus_connection_send_with_reply_and_block() to do the +actual sending. +ibus_proxy_call_with_reply_and_block(). + + An IBusMessage that is the reply or NULL with an error code if the function fails. + + + + + The IBusMessage to be sent. + + + + + + Handle a signal by emitting IBusProxy::ibus-signal. +If signal name is <constant>NameOwnerChanged</constant> +and the service name is identical to the old name, then +Otherwise TRUE is returned. +Note that if the path of of message is not identical to the IBusProxy:path +this function will not emit IBusProxy::ibus-signal. - + TRUE if succeed; FALSE otherwise. + + + + The IBusMessage to be sent. + + + + + Get the service name of a proxy object. + + The service name of the proxy object. + + + + + Get the unique name of the proxy object. + + The service name of the proxy object. + + + + + Get the path of a proxy object. + + The path of proxy object. + + + + + Get interface of a proxy object. + + The service name of the proxy object. + + + + + Get the connection of a proxy object. + + The connection of the proxy object. + + + + + The connection of the proxy object. + + + + The interface of the proxy object. + + + + The service name of the proxy object. + + + + The path of the proxy object. + + - - - - - - - - - - - - - - - + + + + Emitted when sending a signal. +Implement the member function ibus_signal() in extended class to receive this signal. +<note><para>Argument @user_data is ignored in this function.</para></note> + + TRUE if the path of @message is identical to IBusProxy:path and successfully handled. + + + + + An message that contains the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + Rectangle definition. + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + All the fields in the <structname>IBusSerializable</structname> structure are +private to the #IBusSerializable and should never be accessed directly. + + Creates a new instance of an #IBusSerializable. + + a new instance of #IBusSerializable. + + + + + Deserialize an IBusMessageIter to an IBusSerializable/ +The deserialize method should be implemented in extended class. + + The deserialized IBusSerializable. + + + + + An IBusMessageIter. + + + + + + Serialize an IBusSerializable to an IBusMessageIter. +The serialize method should be implemented in extended class. + + TRUE if succeed; FALSE otherwise. + + + + + An IBusMessageIter. + + + + + + + + + + + + + + + + + + + + + + + + + + Attach a value to an IBusSerializable. The value should be serializable as well. +Basic type such as integer, string are deemed to be serializable. + + TRUE if succeed; FALSE otherwise. + + + + + String formatted key for indexing value. + + + + Value to be attached. Should be also serializable. + + + + + + Get a value from attachment of an IBusSerializable. + + The attached value; or NULL if fail to retrieve the value. + + + + + String formatted key for indexing value. + + + + + + Remove a value from attachment of an IBusSerializable. + + + + + + String formatted key for indexing value. + + + + + + Clone an IBusSerializable. +The copy method should be implemented in extended class. + + A newly allocated clone object; or NULL if @object is not serializable. + + + + + Serialize an IBusSerializable to an IBusMessageIter. +The serialize method should be implemented in extended class. + + TRUE if succeed; FALSE otherwise. + + + + + An IBusMessageIter. + + + + + + + + + + + + + + + + + + + + + + TRUE if succeed; FALSE otherwise. + + + + + + + + An IBusMessageIter. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prototype of copy function. +Copy function copy from source IBusSerializable to the destination one. +Returns a gboolean value which indicates whether the copying is success. + + TRUE if succeed; FALSE otherwise. + + + + + The destination IBusSerializable. + + + + A source IBusMessageIter. + + + + + + Prototype of deserialize function. +Deserialize function convert an IBusMessageIter to IBusSerializable. +Returns a gboolean value which indicates whether the conversion is success. + + TRUE if succeed; FALSE otherwise. + + + + + An IBusSerializable. + + + + An IBusMessageIter. + + + + + + Prototype of serialize function. +Serialize function convert an IBusSerializable to IBusMessageIter. +Returns a gboolean value which indicates whether the conversion is success. +Return TRUE if succeed. + + TRUE if succeed; FALSE otherwise. + + + + + An IBusSerializable. + + + + An IBusMessageIter. + + + + + + An opaque object representing an IBusServer. + + New an IBusServer. + + A newly allocated IBusServer instance. + + + + + Listens for new connections on the given address. +If there are multiple semicolon-separated address entries in the address, +tries each one and listens on the first one that works. +Returns FALSE if listening fails for any reason. +To free the server, applications must call first ibus_server_disconnect() and then dbus_server_unref(). + + TRUE if succeed ; FALSE otherwise. + + + + + Address of this server. + + + + + + Releases the server's address and stops listening for new clients. +If called more than once, only the first call has an effect. Does not modify the server's reference count. + + + + + + Returns the address of the server, as a newly-allocated string which must be freed by the caller. + + A newly allocated string which contain address. + + + + + Returns the unique ID of the server, as a newly-allocated string which must be freed by the caller. +This ID is normally used by clients to tell when two IBusConnection would be equivalent +(because the server address passed to ibus_connection_open() will have the same guid in the two cases). +ibus_connection_open() can re-use an existing connection with the same ID instead of opening a new connection. +This is an ID unique to each IBusServer. Remember that an IBusServer represents only one mode of connecting, +so e.g. a bus daemon can listen on multiple addresses which will mean it has multiple IBusServer each with +their own ID. +The ID is not a UUID in the sense of RFC4122; the details are explained in the D-Bus specification. +Returns the address of the server, as a newly-allocated string which must be freed by the caller. + + A newly allocated string which contain address. + + + + + Returns TRUE if the server is still listening for new connections. + + TRUE if the server is still listening for new connections; FALSE otherwise. + + + + + Sets the authentication mechanisms that this server offers to clients, +as a NULL-terminated array of mechanism names. +This function only affects connections created after it is called. +Pass NULL instead of an array to use all available mechanisms (this is the default behavior). +The D-Bus specification describes some of the supported mechanisms. + + TRUE if succeed; FALSE if insufficient memory. + + + + + NULL-terminated array of mechanisms. + + + + + + + + The connection type of server object. + + + + + + + Emitted when a new connection is coming in. +In this handler, IBus could add a reference and continue processing the connection. +If no reference is added, the new connection will be released and closed after this signal. +<note><para>Argument @user_data is ignored in this function.</para></note> + + + + + + The corresponding IBusConnection. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + An opaque data type representing an IBusService. + + New an IBusService. + + A newly allocated IBusService + + + + + Object path. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Returns the object path of an IBusService. + + The object path of @service + + + + + Emit an IBusMessage on an IBusConnection. + + TRUE if succeed; FALSE otherwise. + + + + + Corresponding IBusCOnnection + + + + IBusMessage to be handled. + + + + + + Add an IBus Service to an IBusConnection. +This function also connects the service to the signal IBusConnection::destroy of the connection. + + TRUE if succeed; FALSE otherwise. + + + + + Corresponding IBusCOnnection + + + + + + Returns a copy of list of connections, but the caller does not own the element. + + A newly allocated list of connections. + + + + + + + Remove an IBusService from an IBusConnection. +This function also disconnects the signal IBusConnection::destroy. + + TRUE if succeed; FALSE otherwise. + + + + + Corresponding IBusCOnnection + + + + + + Remove an IBusService from all connections. +This function also disconnects the signal IBusConnection::destroy. + + TRUE if succeed; FALSE otherwise. + + + + + Send signal to all the IBusConnections of an IBusService. + + TRUE if succeed; FALSE otherwise. + + + + + The interface the signal is emitted from. + + + + Name of the signal. + + + + Type of first argument. + + + + + + + + + + The path of service object. + + + + + + + Send a message as IBusMessage though the @connection. +<note><para>Argument @user_data is ignored in this function.</para></note> + + TRUE if succeed; FALSE otherwise. + + + + + Corresponding IBusConnection. + + + + An IBusMessage to be sent. + + + + + + Send a signal as IBusMessage though the @connection. +<note><para>Argument @user_data is ignored in this function.</para></note> + + TRUE if succeed; FALSE otherwise. + + + + + Corresponding IBusConnection. + + + + An IBusMessage to be sent. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prototype of IBus service message sending callback function. + + %TRUE if succeed; %FALSE if failed. + + + + + An IBsService. + + + + Connection to IBus daemon. + + + + IBusMessage to be sent. + + + + + + Prototype of IBus service signal sending callback function. + + %TRUE if succeed; %FALSE if failed. + + + + + An IBsService. + + + + Connection to IBus daemon. + + + + IBusMessage to be sent. + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + A text object in IBus. + + New an IBusText from a string. + + A newly allocated IBusText. + + + + + An text string to be set. + + + + + + New an IBusText from an UCS-4 encoded string. + + A newly allocated IBusText. + + + + + An text string to be set. + + + + + + New an IBusText from a static string. +Since @str is a static string which won't be freed. +This function will NOT duplicate @str. + + A newly allocated IBusText. + + + + + An text string to be set. + + + + + + New an IBusText from a printf expression. +The result of printf expression is stored in the new IBusText instance. + + A newly allocated IBusText. + + + + + printf format string. + + + + + + + + + + New an IBusText from a single UCS4-encoded character. + + A newly allocated IBusText. + + + + + A single UCS4-encoded character. + + + + + + Append an IBusAttribute for IBusText. + + + + + + IBusAttributeType for @text. + + + + Value for the type. + + + + The starting index, inclusive. + + + + The ending index, exclusive. + + + + + + Return number of characters in an IBusText. +This function is based on g_utf8_strlen(), so unlike strlen(), +it does not count by bytes but characters instead. + + Number of character in @text, not counted by bytes. + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + A data type representing an XML nod. + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + New an background IBusAttribute. + + A newly allocated IBusAttribute. + + + + + Color in RGB. + + + + Where attribute starts. + + + + Where attribute ends. + + + + + + New an foreground IBusAttribute. + + A newly allocated IBusAttribute. + + + + + Color in RGB. + + + + Where attribute starts. + + + + Where attribute ends. + + + + + + New an underline IBusAttribute. + + A newly allocated IBusAttribute. + + + + + Type of underline. + + + + Where attribute starts. + + + + Where attribute ends. + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sets the watch and timeout functions of a #DBusConnection +to integrate the connection with the GLib main loop. +This function uses the parameter @user_data and +connection_func set with ibus_mainloop_setup(), +or fall back to NULL and dbus_connection_setup() if those are not defined. - + - - - - - + + A DBusConnection. + - + + Sets the watch and timeout functions of a #DBusServer +to integrate the server with the GLib main loop. +This function uses the parameter @user_data and +server_func set with ibus_mainloop_setup(), +or fall back to NULL and dbus_server_setup() if those are not defined. - + - - - - - + + A DBusServer. + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Free a list of strings. +not be used in newly written code. - + - - - - - - - - + + List of strings. + + + - + + + + + + + + + + + + + + + + + + + + + + + Return the D-Bus address of IBus. +It will find the address from following source: +<orderedlist> +<listitem><para>Environment variable IBUS_ADDRESS</para></listitem> +<listitem><para>Socket file under ~/.config/ibus/bus/</para></listitem> +</orderedlist> - + D-Bus address of IBus. %NULL for not found. + - - - - - - + + Get UID of ibus-daemon. +not be used in newly written code. - + UID of ibus-daemon; or 0 if UID is not available. + - - - - - - - - - + + Obtains the machine UUID of the machine this process is running on. - + A newly allocated string that shows the UUID of the machine. + - - - - - - + + Get the path of socket file. - + A newly allocated string that stores the path of socket file. + - - - - - - + + Get the current user name. +It is determined by: +<orderedlist> +<listitem><para>getlogin()</para></listitem> +<listitem><para>Environment variable SUDO_USER</para></listitem> +<listitem><para>Environment variable USERHELPER_UID</para></listitem> +<listitem><para>Environment variable USERNAME</para></listitem> +<listitem><para>Environment variable LOGNAME</para></listitem> +<listitem><para>Environment variable USER</para></listitem> +<listitem><para>Environment variable LNAME</para></listitem> +</orderedlist> - + A newly allocated string that stores current user name. + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Init the ibus types. +It is actually a wrapper of g_type_init(). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Parse key event string and return key symbol and modifiers. + TRUE for succeed; FALSE if failed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Key event string. - - - - - - - - - - - - - - - - - - - + + Variable that hold key symbol result. + - - + + Variable that hold modifiers result. + - + + Return the name of a key symbol and modifiers. +For example, if press ctrl, shift, and enter, then this function returns: +Shift+Control+enter. - + The name of a key symbol and modifier. + - - + + Key symbol. + - - + + Modifiers such as Ctrl or Shift. + - + + Return the key symbol that associate with the key name. - + Corresponding key symbol. + - - - - + + Key name in #gdk_keys_by_name. - + + Return the name of a key symbol. +Note that the returned string is used internally, so don't free it. - + Corresponding key name. %NULL if no such key symbol. + - - - - - + + Key symbol. + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Runs an IBus main loop until ibus_quit() is called in the loop. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Sets the watch and timeout functions of a #DBusConnection +and #DBusServer to integrate the connection with the GLib main loop. +Parameter @user_data should be in type #GMainContext. +It will be passed to both callback functions, +however, normally %NULL is sufficient. +If called twice for the same user_data, does nothing the second +time. If called once with user_data A and once with user_data B, +user_data B replaces user_data A as the context monitoring the +connection. - + - - + + A DBus connection setup function. + - - + + A prototype of DBus server setup function. + - - - - - - - - - + + User data to be passed to callback function. + - + + + + + + + + + + + + + + Gets the type of an IBusMessage. - + Type of the IBusMessage. + + An IBusMessage. @@ -12788,206 +13209,49 @@ + Allocates an integer ID to be used for storing application-specific data on any IBusPendingCall. The allocated ID may then be used with ibus_pending_call_set_data() and ibus_pending_call_get_data(). The passed-in slot must be initialized to -1, and is filled in with the slot ID. -If the passed-in slot is not -1, it's assumed to be already allocated, and +If the passed-in slot is not -1, it's assumed to be already allocated, and its reference count is increased. The allocated slot is global, i.e. all DBusPendingCall objects -will have a slot with the given integer ID reserved."> +will have a slot with the given integer ID reserved. + TRUE if succeed; FALSE if insufficient memory. - + + Address of a global variable storing the slot. - - - - - - - - - - - - - - - - - - - - + Deallocates a global ID for IBusPendingCall data slots. ibus_pending_call_get_data() and ibus_pending_call_set_data() may no longer be used with this slot. Existing data stored on existing IBusPendingCall objects will be freed when the IBusPendingCall is finalized, but may not be retrieved (and may only be replaced if someone else reallocates the slot). -When the reference count on the passed-in slot reaches 0, it is set to -1."> +When the reference count on the passed-in slot reaches 0, it is set to -1. - + + Address of a global variable storing the slot. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13027,10 +13291,9 @@ - + + Stops an IBus from running. +Any calls to ibus_quit() for the loop will return. @@ -13134,18 +13397,38 @@ - + + Set the display address. + Display address, as in DISPLAY environment for X. + + Sets GLIB's log handler to ours. Our log handler adds time info +including hour, minute, second, and microsecond, like: +(ibus-daemon:7088): IBUS-DEBUG: 18:06:45.822819: ibus-daemon started +If @verbose is TRUE, all levels of messages will be logged. Otherwise, +DEBUG and WARNING messages will be ignored. The function is used in +ibus-daemon, but can be useful for IBus client programs as well for +debugging. It's totally fine for not calling this function. If you +don't set a custom GLIB log handler, the default GLIB log handler will +be used. + + + + + + TRUE for verbose logging. + + + + @@ -13290,38 +13573,40 @@ - + + Gets the type of IBusArray. + Type of IBusArray. + c:identifier="ibus_type_get_dict_entry"> + Gets the type of IBusDictEntry. + Type of IBusDictEntry. + c:identifier="ibus_type_get_object_path"> + Gets the type of object path. + Type of object path. - + + Gets the type of IBusStruct. + Type of IBusStruct. - + + Gets the type of IBusVariant. + Type of IBusVariant. @@ -13445,14 +13730,14 @@ - + + Write D-Bus address to socket file. + D-Bus address of IBus. @@ -13463,54 +13748,57 @@ - + + Free an XML tree. + Root node of an XML tree. - + + Output an XML tree to a GString. + Root node of an XML tree. + GString which stores the output. - + + Parse a string buffer which contains an XML-formatted string, +and return a corresponding XML tree. + Root node of parsed XML tree. + Buffer to be parsed. - + + Parse an XML file and return a corresponding XML tree. + Root node of parsed XML tree. + File name to be parsed. diff -Nru ibus-1.3.7/src/ibusattribute.c ibus-1.3.8/src/ibusattribute.c --- ibus-1.3.7/src/ibusattribute.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusattribute.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusattribute.h ibus-1.3.8/src/ibusattribute.h --- ibus-1.3.7/src/ibusattribute.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusattribute.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusattrlist.c ibus-1.3.8/src/ibusattrlist.c --- ibus-1.3.7/src/ibusattrlist.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusattrlist.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusattrlist.h ibus-1.3.8/src/ibusattrlist.h --- ibus-1.3.7/src/ibusattrlist.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusattrlist.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusbus.c ibus-1.3.8/src/ibusbus.c --- ibus-1.3.7/src/ibusbus.c 2010-07-23 03:48:50.000000000 +0000 +++ ibus-1.3.8/src/ibusbus.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -191,22 +192,12 @@ IBusBusPrivate *priv; priv = IBUS_BUS_GET_PRIVATE (bus); -#if 0 - socket_path = ibus_get_socket_path (); - - if (stat (socket_path, &buf) != 0) { - g_warning ("Can not get stat from %s!", socket_path); - return; - } - if (buf.st_uid != ibus_get_daemon_uid ()) { - g_warning ("The owner of %s is not %s!", socket_path, ibus_get_user_name ()); - return; - } - + /* destry old connection at first */ if (priv->connection != NULL) { - ibus_object_destroy ((IBusObject *) priv->connection); + ibus_object_destroy ((IBusObject *)priv->connection); + g_assert (priv->connection == NULL); } -#endif + if (ibus_get_address () != NULL) { priv->connection = ibus_connection_open (ibus_get_address ()); } @@ -285,7 +276,6 @@ ibus_bus_connect (bus); - file = g_file_new_for_path (ibus_get_socket_path ()); priv->monitor = g_file_monitor_file (file, 0, NULL, NULL); diff -Nru ibus-1.3.7/src/ibusbus.h ibus-1.3.8/src/ibusbus.h --- ibus-1.3.7/src/ibusbus.h 2010-07-23 03:39:13.000000000 +0000 +++ ibus-1.3.8/src/ibusbus.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibuscomponent.c ibus-1.3.8/src/ibuscomponent.c --- ibus-1.3.7/src/ibuscomponent.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuscomponent.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibuscomponent.h ibus-1.3.8/src/ibuscomponent.h --- ibus-1.3.7/src/ibuscomponent.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuscomponent.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusconfig.c ibus-1.3.8/src/ibusconfig.c --- ibus-1.3.7/src/ibusconfig.c 2010-07-23 04:12:34.000000000 +0000 +++ ibus-1.3.8/src/ibusconfig.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusconfig.h ibus-1.3.8/src/ibusconfig.h --- ibus-1.3.7/src/ibusconfig.h 2010-07-23 04:12:34.000000000 +0000 +++ ibus-1.3.8/src/ibusconfig.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusconfigprivate.h ibus-1.3.8/src/ibusconfigprivate.h --- ibus-1.3.7/src/ibusconfigprivate.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusconfigprivate.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusconfigservice.c ibus-1.3.8/src/ibusconfigservice.c --- ibus-1.3.7/src/ibusconfigservice.c 2010-07-23 04:12:34.000000000 +0000 +++ ibus-1.3.8/src/ibusconfigservice.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusconfigservice.h ibus-1.3.8/src/ibusconfigservice.h --- ibus-1.3.7/src/ibusconfigservice.h 2010-07-23 04:12:34.000000000 +0000 +++ ibus-1.3.8/src/ibusconfigservice.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusconnection.c ibus-1.3.8/src/ibusconnection.c --- ibus-1.3.7/src/ibusconnection.c 2010-07-23 03:35:15.000000000 +0000 +++ ibus-1.3.8/src/ibusconnection.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusconnection.h ibus-1.3.8/src/ibusconnection.h --- ibus-1.3.7/src/ibusconnection.h 2010-07-23 03:35:15.000000000 +0000 +++ ibus-1.3.8/src/ibusconnection.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusdbus.h ibus-1.3.8/src/ibusdbus.h --- ibus-1.3.7/src/ibusdbus.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusdbus.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -31,13 +32,44 @@ G_BEGIN_DECLS #ifndef DBUS_H -typedef struct DBusError DBusError; -typedef struct DBusMessage DBusMessage; -typedef struct DBusMessageIter DBusMessageIter; -typedef struct DBusPendingCall DBusPendingCall; +typedef struct IBusError IBusError; +typedef struct IBusMessage IBusMessage; +typedef struct IBusMessageIter IBusMessageIter; +typedef struct IBusPendingCall IBusPendingCall; typedef struct DBusServer DBusServer; typedef struct DBusConnection DBusConnection; #else +/** + * IBusError: + * + * A data type representing an IBusError. + * An IBusError is actually a #DBusError. + * + * @see_also: #DBusError for detail structure definition. + */ +typedef DBusError IBusError; + +/** + * IBusMessage: + * + * An opaque data structure that represents IBusMessage. + */ +typedef DBusMessage IBusMessage; + +/** + * IBusMessageIter: + * + * An opaque data structure that represents IBusMessageIter. + */ +typedef DBusMessageIter IBusMessageIter; + +/** + * IBusPendingCall: + * + * An opaque data structure that represents IBusPendingCall. + */ +typedef DBusPendingCall IBusPendingCall; + #endif G_END_DECLS diff -Nru ibus-1.3.7/src/ibusdebug.h ibus-1.3.8/src/ibusdebug.h --- ibus-1.3.7/src/ibusdebug.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusdebug.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusengine.c ibus-1.3.8/src/ibusengine.c --- ibus-1.3.7/src/ibusengine.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusengine.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusenginedesc.c ibus-1.3.8/src/ibusenginedesc.c --- ibus-1.3.7/src/ibusenginedesc.c 2010-08-03 02:03:05.000000000 +0000 +++ ibus-1.3.8/src/ibusenginedesc.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusenginedesc.h ibus-1.3.8/src/ibusenginedesc.h --- ibus-1.3.7/src/ibusenginedesc.h 2010-08-03 02:03:05.000000000 +0000 +++ ibus-1.3.8/src/ibusenginedesc.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusengine.h ibus-1.3.8/src/ibusengine.h --- ibus-1.3.7/src/ibusengine.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusengine.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusenumtypes.c.template ibus-1.3.8/src/ibusenumtypes.c.template --- ibus-1.3.7/src/ibusenumtypes.c.template 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusenumtypes.c.template 2010-10-21 10:58:33.000000000 +0000 @@ -1,4 +1,5 @@ /*** BEGIN file-header ***/ +#include #include "ibus.h" /*** END file-header ***/ diff -Nru ibus-1.3.7/src/ibuserror.c ibus-1.3.8/src/ibuserror.c --- ibus-1.3.7/src/ibuserror.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuserror.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -62,7 +63,7 @@ } IBusError * -ibus_error_new_from_message (DBusMessage *message) +ibus_error_new_from_message (IBusMessage *message) { g_assert (message != NULL); diff -Nru ibus-1.3.7/src/ibuserror.h ibus-1.3.8/src/ibuserror.h --- ibus-1.3.7/src/ibuserror.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuserror.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -35,16 +36,6 @@ G_BEGIN_DECLS /** - * IBusError: - * - * A data type representing an IBusError. - * An IBusError is actually a #DBusError. - * - * @see_also: #DBusError for detail structure definition. - */ -typedef DBusError IBusError; - -/** * ibus_error_new: * @returns: A newly allocated IBusError. * @@ -84,7 +75,7 @@ * New an IBusError from a #IBusMessage. */ IBusError *ibus_error_new_from_message - (DBusMessage *message); + (IBusMessage *message); /** * ibus_error_free: diff -Nru ibus-1.3.7/src/ibusfactory.c ibus-1.3.8/src/ibusfactory.c --- ibus-1.3.7/src/ibusfactory.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusfactory.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusfactory.h ibus-1.3.8/src/ibusfactory.h --- ibus-1.3.7/src/ibusfactory.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusfactory.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibus.h ibus-1.3.8/src/ibus.h --- ibus-1.3.7/src/ibus.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibus.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibushotkey.c ibus-1.3.8/src/ibushotkey.c --- ibus-1.3.7/src/ibushotkey.c 2010-08-03 02:03:05.000000000 +0000 +++ ibus-1.3.8/src/ibushotkey.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibushotkey.h ibus-1.3.8/src/ibushotkey.h --- ibus-1.3.7/src/ibushotkey.h 2010-08-03 02:03:05.000000000 +0000 +++ ibus-1.3.8/src/ibushotkey.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusinputcontext.c ibus-1.3.8/src/ibusinputcontext.c --- ibus-1.3.7/src/ibusinputcontext.c 2010-08-03 08:57:25.000000000 +0000 +++ ibus-1.3.8/src/ibusinputcontext.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -775,6 +776,10 @@ call_data->keycode, call_data->state | IBUS_FORWARD_MASK); } + + if (reply_message != NULL) { + dbus_message_unref (reply_message); + } } static void diff -Nru ibus-1.3.7/src/ibusinputcontext.h ibus-1.3.8/src/ibusinputcontext.h --- ibus-1.3.7/src/ibusinputcontext.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusinputcontext.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusinternal.c ibus-1.3.8/src/ibusinternal.c --- ibus-1.3.7/src/ibusinternal.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusinternal.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusinternal.h ibus-1.3.8/src/ibusinternal.h --- ibus-1.3.7/src/ibusinternal.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusinternal.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibuskeymap.c ibus-1.3.8/src/ibuskeymap.c --- ibus-1.3.7/src/ibuskeymap.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuskeymap.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibuskeymap.h ibus-1.3.8/src/ibuskeymap.h --- ibus-1.3.7/src/ibuskeymap.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuskeymap.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibuskeynames.c ibus-1.3.8/src/ibuskeynames.c --- ibus-1.3.7/src/ibuskeynames.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibuskeynames.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* GDK - The GIMP Drawing Kit * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * diff -Nru ibus-1.3.7/src/ibuskeysyms.h ibus-1.3.8/src/ibuskeysyms.h --- ibus-1.3.7/src/ibuskeysyms.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibuskeysyms.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang * Copyright (C) 2008-2010 Red Hat, Inc. diff -Nru ibus-1.3.7/src/ibuslookuptable.c ibus-1.3.8/src/ibuslookuptable.c --- ibus-1.3.7/src/ibuslookuptable.c 2010-07-23 03:35:43.000000000 +0000 +++ ibus-1.3.8/src/ibuslookuptable.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibuslookuptable.h ibus-1.3.8/src/ibuslookuptable.h --- ibus-1.3.7/src/ibuslookuptable.h 2010-07-23 03:35:15.000000000 +0000 +++ ibus-1.3.8/src/ibuslookuptable.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusmainloop.c ibus-1.3.8/src/ibusmainloop.c --- ibus-1.3.7/src/ibusmainloop.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusmainloop.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusmainloop.h ibus-1.3.8/src/ibusmainloop.h --- ibus-1.3.7/src/ibusmainloop.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusmainloop.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusmessage.c ibus-1.3.8/src/ibusmessage.c --- ibus-1.3.7/src/ibusmessage.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusmessage.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusmessage.h ibus-1.3.8/src/ibusmessage.h --- ibus-1.3.7/src/ibusmessage.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusmessage.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -76,20 +77,6 @@ G_BEGIN_DECLS /** - * IBusMessage: - * - * An opaque data structure that represents IBusMessage. - */ -typedef DBusMessage IBusMessage; - -/** - * IBusMessageIter: - * - * An opaque data structure that represents IBusMessageIter. - */ -typedef DBusMessageIter IBusMessageIter; - -/** * ibus_type_get_object_path: * @returns: Type of object path. * diff -Nru ibus-1.3.7/src/ibusobject.c ibus-1.3.8/src/ibusobject.c --- ibus-1.3.7/src/ibusobject.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusobject.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusobject.h ibus-1.3.8/src/ibusobject.h --- ibus-1.3.7/src/ibusobject.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusobject.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusobservedpath.c ibus-1.3.8/src/ibusobservedpath.c --- ibus-1.3.7/src/ibusobservedpath.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusobservedpath.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input IBus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusobservedpath.h ibus-1.3.8/src/ibusobservedpath.h --- ibus-1.3.7/src/ibusobservedpath.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusobservedpath.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input IBus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibuspanelservice.c ibus-1.3.8/src/ibuspanelservice.c --- ibus-1.3.7/src/ibuspanelservice.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuspanelservice.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (c) 2009, Google Inc. All rights reserved. @@ -644,9 +645,3 @@ G_TYPE_STRING, &prop_name, G_TYPE_INVALID); } -/* For Emacs: - * Local Variables: - * c-file-style: "gnu" - * c-basic-offset: 4 - * End: - */ diff -Nru ibus-1.3.7/src/ibuspanelservice.h ibus-1.3.8/src/ibuspanelservice.h --- ibus-1.3.7/src/ibuspanelservice.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibuspanelservice.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (c) 2009, Google Inc. All rights reserved. @@ -238,9 +239,3 @@ G_END_DECLS #endif -/* For Emacs: - * Local Variables: - * c-file-style: "gnu" - * c-basic-offset: 4 - * End: - */ diff -Nru ibus-1.3.7/src/ibuspendingcall.c ibus-1.3.8/src/ibuspendingcall.c --- ibus-1.3.7/src/ibuspendingcall.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuspendingcall.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibuspendingcall.h ibus-1.3.8/src/ibuspendingcall.h --- ibus-1.3.7/src/ibuspendingcall.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibuspendingcall.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -40,13 +41,6 @@ G_BEGIN_DECLS /** - * IBusPendingCall: - * - * An opaque data structure that represents IBusPendingCall. - */ -typedef DBusPendingCall IBusPendingCall; - -/** * IBusPendingCallNotifyFunction: * @pending: An IBusPendingCall. * @user_data: User data for the callback function. diff -Nru ibus-1.3.7/src/ibusproperty.c ibus-1.3.8/src/ibusproperty.c --- ibus-1.3.7/src/ibusproperty.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusproperty.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusproperty.h ibus-1.3.8/src/ibusproperty.h --- ibus-1.3.7/src/ibusproperty.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusproperty.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusproplist.c ibus-1.3.8/src/ibusproplist.c --- ibus-1.3.7/src/ibusproplist.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusproplist.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusproplist.h ibus-1.3.8/src/ibusproplist.h --- ibus-1.3.7/src/ibusproplist.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusproplist.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusproxy.c ibus-1.3.8/src/ibusproxy.c --- ibus-1.3.7/src/ibusproxy.c 2010-07-23 03:35:15.000000000 +0000 +++ ibus-1.3.8/src/ibusproxy.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusproxy.h ibus-1.3.8/src/ibusproxy.h --- ibus-1.3.7/src/ibusproxy.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusproxy.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusserializable.c ibus-1.3.8/src/ibusserializable.c --- ibus-1.3.7/src/ibusserializable.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusserializable.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusserializable.h ibus-1.3.8/src/ibusserializable.h --- ibus-1.3.7/src/ibusserializable.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusserializable.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusserver.c ibus-1.3.8/src/ibusserver.c --- ibus-1.3.7/src/ibusserver.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusserver.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusserver.h ibus-1.3.8/src/ibusserver.h --- ibus-1.3.7/src/ibusserver.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusserver.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusservice.c ibus-1.3.8/src/ibusservice.c --- ibus-1.3.7/src/ibusservice.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusservice.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusservice.h ibus-1.3.8/src/ibusservice.h --- ibus-1.3.7/src/ibusservice.h 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusservice.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusshare.c ibus-1.3.8/src/ibusshare.c --- ibus-1.3.7/src/ibusshare.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusshare.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -22,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -307,3 +309,41 @@ g_main_loop_quit (main_loop); } } + +static gboolean ibus_log_handler_is_verbose = FALSE; + +static void +ibus_log_handler (const gchar *log_domain, + GLogLevelFlags log_level, + const gchar *message, + gpointer user_data) +{ + // In the quiet mode (i.e. not verbose), we'll ignore DEBUG and + // WARNING messages. + if (!ibus_log_handler_is_verbose && + ((log_level & G_LOG_LEVEL_DEBUG) || + (log_level & G_LOG_LEVEL_WARNING))) { + return; + } + // Add timing info like "17:34:57.680038" (hour, min, sec, microsecond). + struct timeval time_val; + gettimeofday (&time_val, NULL); + struct tm local_time; + localtime_r (&time_val.tv_sec, &local_time); + char* new_message = + g_strdup_printf ("%02d:%02d:%02d.%6d: %s", + local_time.tm_hour, + local_time.tm_min, + local_time.tm_sec, + (int)time_val.tv_usec, + message); + g_log_default_handler (log_domain, log_level, new_message, user_data); + g_free (new_message); +} + +void +ibus_set_log_handler (gboolean verbose) +{ + ibus_log_handler_is_verbose = verbose; + g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, ibus_log_handler, NULL); +} diff -Nru ibus-1.3.7/src/ibusshare.h ibus-1.3.8/src/ibusshare.h --- ibus-1.3.7/src/ibusshare.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusshare.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang @@ -321,5 +322,23 @@ */ void ibus_quit (void); +/** + * ibus_set_log_handler: + * @verbose: TRUE for verbose logging. + * + * Sets GLIB's log handler to ours. Our log handler adds time info + * including hour, minute, second, and microsecond, like: + * + * (ibus-daemon:7088): IBUS-DEBUG: 18:06:45.822819: ibus-daemon started + * + * If @verbose is TRUE, all levels of messages will be logged. Otherwise, + * DEBUG and WARNING messages will be ignored. The function is used in + * ibus-daemon, but can be useful for IBus client programs as well for + * debugging. It's totally fine for not calling this function. If you + * don't set a custom GLIB log handler, the default GLIB log handler will + * be used. + */ +void ibus_set_log_handler (gboolean verbose); + G_END_DECLS #endif diff -Nru ibus-1.3.7/src/ibustext.c ibus-1.3.8/src/ibustext.c --- ibus-1.3.7/src/ibustext.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibustext.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibustext.h ibus-1.3.8/src/ibustext.h --- ibus-1.3.7/src/ibustext.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibustext.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* IBus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibustypes.h ibus-1.3.8/src/ibustypes.h --- ibus-1.3.7/src/ibustypes.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibustypes.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusversion.h ibus-1.3.8/src/ibusversion.h --- ibus-1.3.7/src/ibusversion.h 2010-08-03 09:00:42.000000000 +0000 +++ ibus-1.3.8/src/ibusversion.h 2010-10-22 06:16:31.000000000 +0000 @@ -49,7 +49,7 @@ * * IBus micro version. */ -#define IBUS_MICRO_VERSION (7) +#define IBUS_MICRO_VERSION (8) /** * IBUS_CHECK_VERSION: diff -Nru ibus-1.3.7/src/ibusxml.c ibus-1.3.8/src/ibusxml.c --- ibus-1.3.7/src/ibusxml.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/ibusxml.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/ibusxml.h ibus-1.3.8/src/ibusxml.h --- ibus-1.3.7/src/ibusxml.h 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/ibusxml.h 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang diff -Nru ibus-1.3.7/src/Makefile.am ibus-1.3.8/src/Makefile.am --- ibus-1.3.7/src/Makefile.am 2010-07-23 03:39:13.000000000 +0000 +++ ibus-1.3.8/src/Makefile.am 2010-10-21 10:58:33.000000000 +0000 @@ -138,7 +138,7 @@ ibusenumtypes.h \ $(NULL) IBus-1.0.gir: $(ibustargetlib) Makefile -IBus_1_0_gir_SCANNERFLAGS = --strip-prefix=IBus --pkg=dbus-1,glib-2.0 +IBus_1_0_gir_SCANNERFLAGS = --pkg=glib-2.0 $(IBUS_GIR_SCANNERFLAGS) IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 IBus_1_0_gir_LIBS = $(ibustargetlib) IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files)) diff -Nru ibus-1.3.7/src/Makefile.in ibus-1.3.8/src/Makefile.in --- ibus-1.3.7/src/Makefile.in 2010-08-03 09:00:33.000000000 +0000 +++ ibus-1.3.8/src/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -271,6 +271,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -329,6 +330,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -530,7 +533,7 @@ @HAVE_INTROSPECTION_TRUE@ ibusenumtypes.h \ @HAVE_INTROSPECTION_TRUE@ $(NULL) -@HAVE_INTROSPECTION_TRUE@IBus_1_0_gir_SCANNERFLAGS = --strip-prefix=IBus --pkg=dbus-1,glib-2.0 +@HAVE_INTROSPECTION_TRUE@IBus_1_0_gir_SCANNERFLAGS = --pkg=glib-2.0 $(IBUS_GIR_SCANNERFLAGS) @HAVE_INTROSPECTION_TRUE@IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 @HAVE_INTROSPECTION_TRUE@IBus_1_0_gir_LIBS = $(ibustargetlib) @HAVE_INTROSPECTION_TRUE@IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files)) diff -Nru ibus-1.3.7/src/test-attribute.c ibus-1.3.8/src/test-attribute.c --- ibus-1.3.7/src/test-attribute.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/test-attribute.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #include "ibus.h" #include "stdio.h" diff -Nru ibus-1.3.7/src/test-bus.c ibus-1.3.8/src/test-bus.c --- ibus-1.3.7/src/test-bus.c 2010-07-23 03:35:15.000000000 +0000 +++ ibus-1.3.8/src/test-bus.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #include #include "ibus.h" diff -Nru ibus-1.3.7/src/test-global-engine.c ibus-1.3.8/src/test-global-engine.c --- ibus-1.3.7/src/test-global-engine.c 2010-07-23 03:39:29.000000000 +0000 +++ ibus-1.3.8/src/test-global-engine.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #include #include "ibus.h" diff -Nru ibus-1.3.7/src/test-keymap.c ibus-1.3.8/src/test-keymap.c --- ibus-1.3.7/src/test-keymap.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/test-keymap.c 2010-10-22 06:15:12.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #include #include #include @@ -18,6 +19,7 @@ int main (int argc, char **argv) { +#if 0 gint fd; struct input_event e; @@ -48,7 +50,7 @@ } g_object_unref (keymap); - return 0; - +#endif + return 0; } #endif diff -Nru ibus-1.3.7/src/test-keynames.c ibus-1.3.8/src/test-keynames.c --- ibus-1.3.7/src/test-keynames.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/test-keynames.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #include "ibus.h" int main() diff -Nru ibus-1.3.7/src/test-lookuptable.c ibus-1.3.8/src/test-lookuptable.c --- ibus-1.3.7/src/test-lookuptable.c 2010-07-23 02:37:08.000000000 +0000 +++ ibus-1.3.8/src/test-lookuptable.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #include #include "ibus.h" diff -Nru ibus-1.3.7/src/test-text.c ibus-1.3.8/src/test-text.c --- ibus-1.3.7/src/test-text.c 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/src/test-text.c 2010-10-21 10:58:33.000000000 +0000 @@ -1,3 +1,4 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ #include "ibus.h" int main() diff -Nru ibus-1.3.7/ui/gtk/candidatepanel.py ibus-1.3.8/ui/gtk/candidatepanel.py --- ibus-1.3.7/ui/gtk/candidatepanel.py 2010-06-29 05:43:12.000000000 +0000 +++ ibus-1.3.8/ui/gtk/candidatepanel.py 2010-10-21 10:58:33.000000000 +0000 @@ -219,14 +219,14 @@ self.__aux_attrs = pango.AttrList() self.__lookup_table = None - self.__cursor_location = (0, 0) + self.__cursor_location = (0, 0, 0, 0) self.__moved_cursor_location = None self.__recreate_ui() def __handle_move_end_cb(self, handle): # store moved location - self.__moved_cursor_location = self.__toplevel.get_position() + self.__moved_cursor_location = self.__toplevel.get_position() + (self.__cursor_location[2], self.__cursor_location[3]) def __recreate_ui(self): for w in self: @@ -428,10 +428,10 @@ self.__lookup_table.cursor_down() self.__refresh_candidates() - def set_cursor_location(self, x, y): + def set_cursor_location(self, x, y, w, h): # if cursor location is changed, we reset the moved cursor location - if self.__cursor_location != (x, y): - self.__cursor_location = (x, y) + if self.__cursor_location != (x, y, w, h): + self.__cursor_location = (x, y, w, h) self.__moved_cursor_location = None self.__check_position() @@ -484,21 +484,26 @@ def __check_position(self): cursor_location = self.__moved_cursor_location or self.__cursor_location - bx = cursor_location[0] + self.__toplevel.allocation.width - by = cursor_location[1] + self.__toplevel.allocation.height + + cursor_right = cursor_location[0] + cursor_location[2] + cursor_bottom = cursor_location[1] + cursor_location[3] + + window_right = cursor_right + self.__toplevel.allocation.width + window_bottom = cursor_bottom + self.__toplevel.allocation.height root_window = gdk.get_default_root_window() sx, sy = root_window.get_size() - if bx > sx: + if window_right > sx: x = sx - self.__toplevel.allocation.width else: - x = cursor_location[0] + x = cursor_right - if by > sy: - y = sy - self.__toplevel.allocation.height + if window_bottom > sy: + # move the window just above the cursor so the window and a preedit string do not overlap. + y = cursor_location[1] - self.__toplevel.allocation.height else: - y = cursor_location[1] + y = cursor_bottom self.move(x, y) diff -Nru ibus-1.3.7/ui/gtk/Makefile.in ibus-1.3.8/ui/gtk/Makefile.in --- ibus-1.3.7/ui/gtk/Makefile.in 2010-08-03 09:00:33.000000000 +0000 +++ ibus-1.3.8/ui/gtk/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -182,6 +182,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -240,6 +241,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/ui/gtk/panel.py ibus-1.3.8/ui/gtk/panel.py --- ibus-1.3.7/ui/gtk/panel.py 2010-08-03 08:59:09.000000000 +0000 +++ ibus-1.3.8/ui/gtk/panel.py 2010-10-22 03:27:37.000000000 +0000 @@ -22,6 +22,7 @@ import gtk import gtk.gdk as gdk +import glib import gobject import ibus import icon as _icon @@ -63,15 +64,12 @@ self.__bus = bus self.__config = self.__bus.get_config() self.__focus_ic = None - self.__setup_pid = 0 + self.__setup_pid = None self.__prefix = os.getenv("IBUS_PREFIX") self.__data_dir = path.join(self.__prefix, "share", "ibus") # self.__icons_dir = path.join(self.__data_dir, "icons") self.__setup_cmd = path.join(self.__prefix, "bin", "ibus-setup") - # hanlder signal - signal.signal(signal.SIGCHLD, self.__sigchld_cb) - # connect bus signal self.__config.connect("value-changed", self.__config_value_changed_cb) self.__config.connect("reloaded", self.__config_reloaded_cb) @@ -122,7 +120,7 @@ # self.__bus.request_name(ibus.panel.IBUS_SERVICE_PANEL, 0) def set_cursor_location(self, x, y, w, h): - self.__candidate_panel.set_cursor_location(x + w, y + h) + self.__candidate_panel.set_cursor_location(x, y, w, h) def update_preedit_text(self, text, cursor_pos, visible): self.__candidate_panel.update_preedit_text(text, cursor_pos, visible) @@ -501,20 +499,23 @@ else: print >> sys.stderr, "Unknown command %s" % command - def __sigchld_cb(self, sig, sf): - try: - pid, status = os.wait() - if self.__setup_pid == pid: - self.__setup_pid = 0 - except: - pass + def __child_watch_cb(self, pid, status): + if self.__setup_pid == pid: + self.__setup_pid.close() + self.__setup_pid = None def __start_setup(self): - if self.__setup_pid != 0: - pid, state = os.waitpid(self.__setup_pid, os.P_NOWAIT) - if pid != self.__setup_pid: + if self.__setup_pid != None: + try: + # if setup dialog is running, bring the dialog to front by SIGUSR1 os.kill(self.__setup_pid, signal.SIGUSR1) return - self.__setup_pid = 0 - self.__setup_pid = os.spawnl(os.P_NOWAIT, self.__setup_cmd, "ibus-setup") - + except OSError: + # seems the setup dialog is not running anymore + self.__setup_pid.close() + self.__setup_pid = None + + pid = glib.spawn_async(argv=[self.__setup_cmd, "ibus-setup"], + flags=glib.SPAWN_DO_NOT_REAP_CHILD)[0] + self.__setup_pid = pid + glib.child_watch_add(self.__setup_pid, self.__child_watch_cb) diff -Nru ibus-1.3.7/ui/Makefile.in ibus-1.3.8/ui/Makefile.in --- ibus-1.3.7/ui/Makefile.in 2010-08-03 09:00:33.000000000 +0000 +++ ibus-1.3.8/ui/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -192,6 +192,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -250,6 +251,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/util/IMdkit/Makefile.in ibus-1.3.8/util/IMdkit/Makefile.in --- ibus-1.3.7/util/IMdkit/Makefile.in 2010-08-03 09:00:33.000000000 +0000 +++ ibus-1.3.8/util/IMdkit/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -194,6 +194,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -252,6 +253,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru ibus-1.3.7/util/Makefile.in ibus-1.3.8/util/Makefile.in --- ibus-1.3.7/util/Makefile.in 2010-08-03 09:00:33.000000000 +0000 +++ ibus-1.3.8/util/Makefile.in 2010-10-22 06:16:25.000000000 +0000 @@ -192,6 +192,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ +IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -250,6 +251,8 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@