IBus: headers diff between 1.5.4 and 1.5.5 versions

	ibusattribute.h	ibusattribute.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* IBus - The Input Bus	/* IBus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_ATTRIBUTE_H_
		#define __IBUS_ATTRIBUTE_H_

	/**	/**
	* SECTION: ibusattribute	* SECTION: ibusattribute
	* @short_description: Attributes of IBusText.	* @short_description: Attributes of IBusText.
	* @see_also: #IBusText	* @see_also: #IBusText
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusAttribute represents an attribute that associate to IBusText.	* An IBusAttribute represents an attribute that associate to IBusText.

	* It decorates preedit buffer and auxiliary text with underline, foregroun	* It decorates preedit buffer and auxiliary text with underline, foregroun
	d and background colors.	d
		* and background colors.
	*/	*/

	#ifndef __IBUS_ATTRIBUTE_H_
	#define __IBUS_ATTRIBUTE_H_

	#include "ibusserializable.h"	#include "ibusserializable.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/*	/*
	* Type macros.	* Type macros.
	*/	*/
	/* define IBusAttribute macros */	/* define IBusAttribute macros */
	#define IBUS_TYPE_ATTRIBUTE \	#define IBUS_TYPE_ATTRIBUTE \

End of changes. 4 change blocks.
	6 lines changed or deleted	8 lines changed or added

	ibusattrlist.h	ibusattrlist.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* IBus - The Input Bus	/* IBus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_ATTRIBUTE_LIST_H_
		#define __IBUS_ATTRIBUTE_LIST_H_

	/**	/**
	* SECTION: ibusattrlist	* SECTION: ibusattrlist
	* @Title: IBusAttrList	* @Title: IBusAttrList
	* @Short_description: AttrList of IBusText.	* @Short_description: AttrList of IBusText.
	* @See_also: #IBusAttribute #IBusText	* @See_also: #IBusAttribute #IBusText
	* @Stability: Stable	* @Stability: Stable
	*	*
	*/	*/

	#ifndef __IBUS_ATTRIBUTE_LIST_H_
	#define __IBUS_ATTRIBUTE_LIST_H_

	#include "ibusattribute.h"	#include "ibusattribute.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/*	/*
	* Type macros.	* Type macros.
	*/	*/
	/* define IBusAttrList macros */	/* define IBusAttrList macros */
	#define IBUS_TYPE_ATTR_LIST \	#define IBUS_TYPE_ATTR_LIST \

End of changes. 3 change blocks.
	4 lines changed or deleted	5 lines changed or added

	ibuscomponent.h	ibuscomponent.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* bus - The Input Bus	/* bus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_COMPONENT_H_
		#define __IBUS_COMPONENT_H_

	/**	/**
	* SECTION: ibuscomponent	* SECTION: ibuscomponent
	* @short_description: Component (executable) specification.	* @short_description: Component (executable) specification.
	* @title: IBusComponent	* @title: IBusComponent
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusComponent is an executable program.	* An IBusComponent is an executable program.
	* It provides services such as user interface, configuration,	* It provides services such as user interface, configuration,
	* and input method engine (IME).	* and input method engine (IME).
	*	*
	* It is recommended that IME developers provide	* It is recommended that IME developers provide
	* a component XML file and	* a component XML file and
	* load the XML file by ibus_component_new_from_file().	* load the XML file by ibus_component_new_from_file().
	*	*
	* The format of a component XML file is described at	* The format of a component XML file is described at
	* <ulink url="http://code.google.com/p/ibus/wiki/DevXML">http://code.googl e.com/p/ibus/wiki/DevXML</ulink>	* <ulink url="http://code.google.com/p/ibus/wiki/DevXML">http://code.googl e.com/p/ibus/wiki/DevXML</ulink>
	*/	*/

	#ifndef __IBUS_COMPONENT_H_
	#define __IBUS_COMPONENT_H_

	#include "ibusserializable.h"	#include "ibusserializable.h"
	#include "ibusobservedpath.h"	#include "ibusobservedpath.h"
	#include "ibusenginedesc.h"	#include "ibusenginedesc.h"
	#include "ibusxml.h"	#include "ibusxml.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/


End of changes. 3 change blocks.
	4 lines changed or deleted	5 lines changed or added

	ibusconfig.h	ibusconfig.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_CONFIG_H_
		#define __IBUS_CONFIG_H_

	/**	/**
	* SECTION: ibusconfig	* SECTION: ibusconfig
	* @title: IBusConfig	* @title: IBusConfig
	* @short_description: IBus engine configuration module.	* @short_description: IBus engine configuration module.
	*	*
	* An IBusConfig provides engine configuration methods	* An IBusConfig provides engine configuration methods
	* such as get and set the configure settings to configuration file.	* such as get and set the configure settings to configuration file.
	*	*
	* Currently, IBusConfig supports gconf.	* Currently, IBusConfig supports gconf.
	*/	*/

	#ifndef __CONFIG_H_
	#define __CONFIG_H_

	#include "ibusproxy.h"	#include "ibusproxy.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	/* define GOBJECT macros */	/* define GOBJECT macros */
	#define IBUS_TYPE_CONFIG \	#define IBUS_TYPE_CONFIG \
	(ibus_config_get_type ())	(ibus_config_get_type ())

	skipping to change at line 119	skipping to change at line 120
	void ibus_config_new_async (GDBusConnection *connection ,	void ibus_config_new_async (GDBusConnection *connection ,
	GCancellable *cancellabl e,	GCancellable *cancellabl e,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data) ;	gpointer user_data) ;

	/**	/**
	* ibus_config_new_async_finish:	* ibus_config_new_async_finish:
	* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to	* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to
	* ibus_config_new_async().	* ibus_config_new_async().
	* @error: Return location for error or %NULL.	* @error: Return location for error or %NULL.

	*
	* @returns: A newly allocated #IBusConfig.	* @returns: A newly allocated #IBusConfig.
	*	*
	* Finishes an operation started with ibus_config_new_async().	* Finishes an operation started with ibus_config_new_async().
	*/	*/
	IBusConfig *ibus_config_new_async_finish	IBusConfig *ibus_config_new_async_finish
	(GAsyncResult *res,	(GAsyncResult *res,
	GError **error);	GError **error);

	/**	/**
	* ibus_config_get_value:	* ibus_config_get_value:

End of changes. 4 change blocks.
	5 lines changed or deleted	5 lines changed or added

	ibusconfigservice.h	ibusconfigservice.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_CONFIG_SERVICE_H_
		#define __IBUS_CONFIG_SERVICE_H_

	/**	/**
	* SECTION: ibusconfigservice	* SECTION: ibusconfigservice
	* @short_description: Configuration service back-end.	* @short_description: Configuration service back-end.
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusConfigService is a base class for other configuration services su ch as GConf.	* An IBusConfigService is a base class for other configuration services su ch as GConf.
	* Currently, directly known sub class is IBusConfigGConf.	* Currently, directly known sub class is IBusConfigGConf.
	*	*
	* IBusConfigServiceClass has following member functions:	* IBusConfigServiceClass has following member functions:
	* <itemizedlist>	* <itemizedlist>

	skipping to change at line 98	skipping to change at line 101
	* <term>value:</term>	* <term>value:</term>
	* <listitem>GValue that holds the value.</listitem>	* <listitem>GValue that holds the value.</listitem>
	* </varlistentry>	* </varlistentry>
	* <varlistentry>	* <varlistentry>
	* <term>error:</term>	* <term>error:</term>
	* <listitem>Error outputs here.</listitem>	* <listitem>Error outputs here.</listitem>
	* </varlistentry>	* </varlistentry>
	* <varlistentry>	* <varlistentry>
	* <term>Returns:</term>	* <term>Returns:</term>
	* <listitem>TRUE if succeed; FALSE otherwise.</listitem>	* <listitem>TRUE if succeed; FALSE otherwise.</listitem>

	* </varlistentry>	* </varlistentry>
	* </variablelist>	* </variablelist>
	* <para>Get value of a configuration option.	* <para>Get value of a configuration option.
	* </para>	* </para>
	* </listitem>	* </listitem>
	* <listitem>	* <listitem>
	* <para>gboolean unset(IBusConfigService config, const gchar sec tion, const gchar *name,	* <para>gboolean unset(IBusConfigService config, const gchar sec tion, const gchar *name,
	* IBusError **error)	* IBusError **error)
	* </para>	* </para>
	* <variablelist>	* <variablelist>
	* <varlistentry>	* <varlistentry>
	* <term>config:</term>	* <term>config:</term>

	skipping to change at line 134	skipping to change at line 137
	* <varlistentry>	* <varlistentry>
	* <term>Returns:</term>	* <term>Returns:</term>
	* <listitem>TRUE if succeed; FALSE otherwise.</listitem>	* <listitem>TRUE if succeed; FALSE otherwise.</listitem>
	* </varlistentry>	* </varlistentry>
	* </variablelist>	* </variablelist>
	* <para>Remove an entry to a configuration option.	* <para>Remove an entry to a configuration option.
	* </para>	* </para>
	* </listitem>	* </listitem>
	* </itemizedlist>	* </itemizedlist>
	*/	*/

	#ifndef __IBUS_CONFIG_SERVICE_H_
	#define __IBUS_CONFIG_SERVICE_H_

	#include "ibusservice.h"	#include "ibusservice.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	/* define GOBJECT macros */	/* define GOBJECT macros */
	#define IBUS_TYPE_CONFIG_SERVICE \	#define IBUS_TYPE_CONFIG_SERVICE \
	(ibus_config_service_get_type ())	(ibus_config_service_get_type ())

	skipping to change at line 191	skipping to change at line 192
	gboolean (* set_value) (IBusConfigService *config,	gboolean (* set_value) (IBusConfigService *config,
	const gchar *section,	const gchar *section,
	const gchar *name,	const gchar *name,
	GVariant *value,	GVariant *value,
	GError **error);	GError **error);
	/**	/**
	* get_value:	* get_value:
	* @config: An IBusConfig.	* @config: An IBusConfig.
	* @section: section name	* @section: section name
	* @name: value name	* @name: value name

	*
	* @returns: (transfer full): The value in config associated with secti on and name.	* @returns: (transfer full): The value in config associated with secti on and name.
	*	*
	*/	*/
	GVariant * (* get_value) (IBusConfigService *config,	GVariant * (* get_value) (IBusConfigService *config,
	const gchar *section,	const gchar *section,
	const gchar *name,	const gchar *name,
	GError **error);	GError **error);
	gboolean (* unset_value) (IBusConfigService *config,	gboolean (* unset_value) (IBusConfigService *config,
	const gchar *section,	const gchar *section,
	const gchar *name,	const gchar *name,

End of changes. 5 change blocks.
	7 lines changed or deleted	7 lines changed or added

	ibusdebug.h	ibusdebug.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_DEBUG_H_
		#define __IBUS_DEBUG_H_

	/**	/**
	* SECTION: ibusdebug	* SECTION: ibusdebug
	* @short_description: Debug message output.	* @short_description: Debug message output.
	* @stability: Stable	* @stability: Stable
	*	*
	* This section lists functions that generate debug and warning messages.	* This section lists functions that generate debug and warning messages.
	*/	*/

	#ifndef __IBUS_DEBUG_H_
	#define __IBUS_DEBUG_H_

	/**	/**
	* ibus_warning:	* ibus_warning:
	* @msg: A printf formatted message to be print.	* @msg: A printf formatted message to be print.
	* @args...: Necessary arguments for @msg.	* @args...: Necessary arguments for @msg.
	*	*
	* A convenient wrapper for g_warning.	* A convenient wrapper for g_warning.
	* The output format will be	* The output format will be
	* <programlisting>	* <programlisting>
	* source_file:line, message...	* source_file:line, message...

End of changes. 3 change blocks.
	4 lines changed or deleted	5 lines changed or added

	ibusengine.h	ibusengine.h

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_ENGINE_H_
		#define __IBUS_ENGINE_H_

	/**	/**
	* SECTION: ibusengine	* SECTION: ibusengine
	* @short_description: Input method engine abstract.	* @short_description: Input method engine abstract.
	* @title: IBusEngine	* @title: IBusEngine
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusEngine provides infrastructure for input method engine.	* An IBusEngine provides infrastructure for input method engine.
	* Developers can "extend" this class for input method engine development.	* Developers can "extend" this class for input method engine development.
	*	*
	* see_also: #IBusComponent, #IBusEngineDesc	* see_also: #IBusComponent, #IBusEngineDesc
	*/	*/

	#ifndef __IBUS_ENGINE_H_
	#define __IBUS_ENGINE_H_

	#include "ibusservice.h"	#include "ibusservice.h"
	#include "ibusattribute.h"	#include "ibusattribute.h"
	#include "ibuslookuptable.h"	#include "ibuslookuptable.h"
	#include "ibusproplist.h"	#include "ibusproplist.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/


End of changes. 2 change blocks.
	2 lines changed or deleted	3 lines changed or added

	ibusenginedesc.h	ibusenginedesc.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* bus - The Input Bus	/* bus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_ENGINE_DESC_H_
		#define __IBUS_ENGINE_DESC_H_

	/**	/**
	* SECTION: ibusenginedesc	* SECTION: ibusenginedesc
	* @short_description: Input method engine description data.	* @short_description: Input method engine description data.
	* @title: IBusEngineDesc	* @title: IBusEngineDesc
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusEngineDesc stores description data of IBusEngine.	* An IBusEngineDesc stores description data of IBusEngine.
	* The description data can either be passed to ibus_engine_desc_new(),	* The description data can either be passed to ibus_engine_desc_new(),
	* or loaded from an XML node through ibus_engine_desc_new_from_xml_node()	* or loaded from an XML node through ibus_engine_desc_new_from_xml_node()
	* to construct IBusEngineDesc.	* to construct IBusEngineDesc.
	*	*
	* However, the recommended way to load engine description data is	* However, the recommended way to load engine description data is
	* using ibus_component_new_from_file() to load a component file,	* using ibus_component_new_from_file() to load a component file,
	* which also includes engine description data.	* which also includes engine description data.
	*	*

	* @see_also: #IBusComponent, #IBusEngine	* see_also: #IBusComponent, #IBusEngine
	*	*
	*/	*/


	#ifndef __ENGINE_DESC_H_
	#define __ENGINE_DESC_H_

	#include "ibusserializable.h"	#include "ibusserializable.h"
	#include "ibusxml.h"	#include "ibusxml.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	/* define GOBJECT macros */	/* define GOBJECT macros */
	#define IBUS_TYPE_ENGINE_DESC \	#define IBUS_TYPE_ENGINE_DESC \
	(ibus_engine_desc_get_type ())	(ibus_engine_desc_get_type ())

End of changes. 4 change blocks.
	6 lines changed or deleted	6 lines changed or added

	ibusenginesimple.h	ibusenginesimple.h

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_ENGINE_SIMPLE_H__
		#define __IBUS_ENGINE_SIMPLE_H__

	/**	/**
	* SECTION: ibussimpleengine	* SECTION: ibussimpleengine
	* @short_description: Input method engine supporting table-based input met hod	* @short_description: Input method engine supporting table-based input met hod
	* @title: IBusEngineSimple	* @title: IBusEngineSimple
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusEngineSimple provides table-based input method logic.	* An IBusEngineSimple provides table-based input method logic.
	*	*
	* see_also: #IBusEngine	* see_also: #IBusEngine
	*/	*/

	#ifndef __IBUS_ENGINE_SIMPLE_H__
	#define __IBUS_ENGINE_SIMPLE_H__

	#include "ibusengine.h"	#include "ibusengine.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define IBUS_MAX_COMPOSE_LEN 7	#define IBUS_MAX_COMPOSE_LEN 7

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	skipping to change at line 113	skipping to change at line 114
	* than %IBUS_MAX_COMPOSE_LEN)	* than %IBUS_MAX_COMPOSE_LEN)
	*	*
	* Adds an additional table to search to the engine. Each row of the table	* Adds an additional table to search to the engine. Each row of the table
	* consists of max_seq_len key symbols followed by two guint16 interpreted as	* consists of max_seq_len key symbols followed by two guint16 interpreted as
	* the high and low words of a gunicode value. Tables are searched starting from	* the high and low words of a gunicode value. Tables are searched starting from
	* the last added.	* the last added.
	*	*
	* The table must be sorted in dictionary order on the numeric value of the key	* The table must be sorted in dictionary order on the numeric value of the key
	* symbol fields. (Values beyond the length of the sequence should be zero. )	* symbol fields. (Values beyond the length of the sequence should be zero. )
	*/	*/

	void ibus_engine_simple_add_table (IBusEngineSimple *simple,	void ibus_engine_simple_add_table (IBusEngineSimple *simple,
	const guint16 *data,	const guint16 *data,
	gint max_seq_le	gint max_seq
	n,	_len,
	gint n_seqs);	gint n_seqs)
		;


		/**
		* ibus_engine_simple_add_table_by_locale:
		* @simple: An IBusEngineSimple.
		* @locale: (allow-none): The locale name. If the locale is %NULL,
		* the current locale is used.
		* @returns: %TRUE if the @locale is matched to the table.
		*
		* Call ibus_engine_simple_add_table() internally by locale.
		*/
		gboolean ibus_engine_simple_add_table_by_locale
		(IBusEngineSimple *simple,
		const gchar *locale)
		;
	G_END_DECLS	G_END_DECLS

	#endif // __IBUS_ENGINE_SIMPLE_H__	#endif // __IBUS_ENGINE_SIMPLE_H__

End of changes. 4 change blocks.
	7 lines changed or deleted	22 lines changed or added

	ibusenumtypes.h	ibusenumtypes.h

	/* Generated data (by glib-mkenums) */	/* Generated data (by glib-mkenums) */


		#ifndef __IBUS_ENUM_TYPES_H__
		#define __IBUS_ENUM_TYPES_H__

	/**	/**
	* SECTION: ibusenumtypes	* SECTION: ibusenumtypes
	* @short_description: Enumeration definition in IBus.	* @short_description: Enumeration definition in IBus.
	* @stability: Stable	* @stability: Stable
	*	*
	* IBusEnumTypes lists IBus enumeration types.	* IBusEnumTypes lists IBus enumeration types.
	*/	*/

	#ifndef __IBUS_ENUM_TYPES_H__
	#define __IBUS_ENUM_TYPES_H__

	#include <glib-object.h>	#include <glib-object.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/* enumerations from "ibusobject.h" */	/* enumerations from "ibusobject.h" */
	/**	/**
	* ibus_object_flags_get_type:	* ibus_object_flags_get_type:
	* @returns: GType of IBUS_OBJECT_FLAGS	* @returns: GType of IBUS_OBJECT_FLAGS
	*	*

End of changes. 2 change blocks.
	2 lines changed or deleted	3 lines changed or added

	ibuserror.h	ibuserror.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2011 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 26	skipping to change at line 26
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_ERROR_H_
		#define __IBUS_ERROR_H_

	/**	/**

	* SECTION: ibusshare	* SECTION: ibuserror
	* @short_description: Shared utility functions and definition.	* @short_description: Error functions and definition.
	* @stability: Stable	* @stability: Stable
	*	*

	* This file defines some utility functions and definition	* This file defines some error functions and definition.
	* which are shared among ibus component and services.
	*/	*/


	#ifndef __IBUS_ERROR_H_
	#define __IBUS_ERROR_H_

	#include <glib.h>	#include <glib.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define IBUS_ERROR ibus_error_quark()	#define IBUS_ERROR ibus_error_quark()
	GQuark ibus_error_quark (void);	GQuark ibus_error_quark (void);

	G_END_DECLS	G_END_DECLS
	#endif	#endif

End of changes. 5 change blocks.
	8 lines changed or deleted	7 lines changed or added

	ibusfactory.h	ibusfactory.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_FACTORY_H_
		#define __IBUS_FACTORY_H_

	/**	/**
	* SECTION: ibusfactory	* SECTION: ibusfactory
	* @short_description: Factory for creating engine instances.	* @short_description: Factory for creating engine instances.
	* @title: IBusFactory	* @title: IBusFactory
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusFactory is an #IBusService that creates input method engine (IME) instance.	* An IBusFactory is an #IBusService that creates input method engine (IME) instance.
	* It provides CreateEngine remote method, which creates an IME instance by name,	* It provides CreateEngine remote method, which creates an IME instance by name,
	* and returns the D-Bus object path to IBus daemon.	* and returns the D-Bus object path to IBus daemon.
	*	*

	* @see_also: #IBusEngine	* see_also: #IBusEngine
	*	*
	*/	*/

	#ifndef __IBUS_FACTORY_H_
	#define __IBUS_FACTORY_H_

	#include "ibusservice.h"	#include "ibusservice.h"
	#include "ibusserializable.h"	#include "ibusserializable.h"
	#include "ibusengine.h"	#include "ibusengine.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

End of changes. 4 change blocks.
	5 lines changed or deleted	6 lines changed or added

	ibushotkey.h	ibushotkey.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* IBus - The Input Bus	/* IBus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_HOTKEY_H_
		#define __IBUS_HOTKEY_H_

	/**	/**
	* SECTION: ibushotkey	* SECTION: ibushotkey
	* @short_description: Hotkeys and associated events.	* @short_description: Hotkeys and associated events.
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusHotkeyProfile associates a hotkey and an event.	* An IBusHotkeyProfile associates a hotkey and an event.
	*/	*/

	#ifndef __IBUS_HOTKEY_H_
	#define __IBUS_HOTKEY_H_

	#include "ibusserializable.h"	#include "ibusserializable.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/
	/* define IBusHotkeyProfile macros */	/* define IBusHotkeyProfile macros */
	#define IBUS_TYPE_HOTKEY_PROFILE \	#define IBUS_TYPE_HOTKEY_PROFILE \
	(ibus_hotkey_profile_get_type ())	(ibus_hotkey_profile_get_type ())
	#define IBUS_HOTKEY_PROFILE(obj) \	#define IBUS_HOTKEY_PROFILE(obj) \

End of changes. 3 change blocks.
	4 lines changed or deleted	5 lines changed or added

	ibuskeymap.h	ibuskeymap.h

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_KEYMAP_H_
		#define __IBUS_KEYMAP_H_

	/**	/**
	* SECTION: ibuskeymap	* SECTION: ibuskeymap
	* @short_description: Keyboard mapping handling.	* @short_description: Keyboard mapping handling.
	* @title: IBusKeymap	* @title: IBusKeymap
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusKeymap defines the mapping between keyboard scancodes and	* An IBusKeymap defines the mapping between keyboard scancodes and
	* keyboard symbols such as numbers, alphabets, and punctuation marks.	* keyboard symbols such as numbers, alphabets, and punctuation marks.
	*	*
	* Some input methods assume certain keyboard layout	* Some input methods assume certain keyboard layout
	* (such as Chewing and Wubi requires an US-QWERTY layout),	* (such as Chewing and Wubi requires an US-QWERTY layout),
	* and expect key symbols to be arranged in that order.	* and expect key symbols to be arranged in that order.
	* These input methods should new an IBusKeymap	* These input methods should new an IBusKeymap
	* instance and define the keyboard layout.	* instance and define the keyboard layout.
	* Then ibus_keymap_lookup_keysym() can	* Then ibus_keymap_lookup_keysym() can
	* convert scancodes back to the key symbols.	* convert scancodes back to the key symbols.
	*	*

	* @see_also: #IBusComponent, #IBusEngineDesc	* see_also: #IBusComponent, #IBusEngineDesc
	*	*
	*/	*/


	#ifndef __IBUS_KEYMAP_H_
	#define __IBUS_KEYMAP_H_

	#include "ibusobject.h"	#include "ibusobject.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/
	/* define IBusKeymap macros */	/* define IBusKeymap macros */
	#define IBUS_TYPE_KEYMAP \	#define IBUS_TYPE_KEYMAP \
	(ibus_keymap_get_type ())	(ibus_keymap_get_type ())
	#define IBUS_KEYMAP(obj) \	#define IBUS_KEYMAP(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_KEYMAP, IBusKeymap))	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_KEYMAP, IBusKeymap))

	skipping to change at line 132	skipping to change at line 132
	*	*
	* Deprecated: This function has been deprecated and should	* Deprecated: This function has been deprecated and should
	* not be used in newly written code. Please use ibus_keymap_get().	* not be used in newly written code. Please use ibus_keymap_get().
	*/	*/
	IBusKeymap ibus_keymap_new (const gchar na me)	IBusKeymap ibus_keymap_new (const gchar na me)
	G_GNUC_DEPRECATED;	G_GNUC_DEPRECATED;

	/**	/**
	* ibus_keymap_get:	* ibus_keymap_get:
	* @name: The keymap file to be loaded, such as 'us', 'jp'.	* @name: The keymap file to be loaded, such as 'us', 'jp'.

	* @returns: An IBusKeymap associated with the giving name; or NULL if fail	* @returns: (transfer full): An IBusKeymap associated with the giving name
	ed.	;
		* or %NULL if failed.
	*	*
	* Get an IBusKeymap associated with the giving name.	* Get an IBusKeymap associated with the giving name.
	*	*
	* This function loads the keymap file specified in @name	* This function loads the keymap file specified in @name
	* in the IBUS_DATA_DIR/keymaps directory.	* in the IBUS_DATA_DIR/keymaps directory.
	*/	*/
	IBusKeymap ibus_keymap_get (const gchar na me);	IBusKeymap ibus_keymap_get (const gchar na me);

	/**	/**
	* ibus_keymap_lookup_keysym:	* ibus_keymap_lookup_keysym:

End of changes. 4 change blocks.
	6 lines changed or deleted	7 lines changed or added

	ibuskeysyms-compat.h	ibuskeysyms-compat.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 26	skipping to change at line 26
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_KEYSYMS_COMPAT_H__
		#define __IBUS_KEYSYMS_COMPAT_H__

	/**	/**
	* SECTION: ibuskeysyms	* SECTION: ibuskeysyms
	* @short_description: Key symbol definition.	* @short_description: Key symbol definition.
	* @title: IBusKeysyms	* @title: IBusKeysyms
	* @stability: Stable	* @stability: Stable
	*	*
	* This section defines the key symbols (keysym) used in IBus.	* This section defines the key symbols (keysym) used in IBus.
	* Those keysym data is converted from keysymdef.h in	* Those keysym data is converted from keysymdef.h in
	* FreeDesktop.	* FreeDesktop.
	*	*
	* Most of the key symbols are not explicit documented,	* Most of the key symbols are not explicit documented,
	* because they are self-explaining.	* because they are self-explaining.
	*	*

	* @see_also: #IBusKeymap, #IBusHotkeyProfile	* see_also: #IBusKeymap, #IBusHotkeyProfile
	*	*
	*/	*/


	#ifndef __IBUS_KEYSYMS_COMPAT_H__
	#define __IBUS_KEYSYMS_COMPAT_H__

	#define IBUS_VoidSymbol 0xffffff	#define IBUS_VoidSymbol 0xffffff
	#define IBUS_BackSpace 0xff08	#define IBUS_BackSpace 0xff08
	#define IBUS_Tab 0xff09	#define IBUS_Tab 0xff09
	#define IBUS_Linefeed 0xff0a	#define IBUS_Linefeed 0xff0a
	#define IBUS_Clear 0xff0b	#define IBUS_Clear 0xff0b
	#define IBUS_Return 0xff0d	#define IBUS_Return 0xff0d
	#define IBUS_Pause 0xff13	#define IBUS_Pause 0xff13
	#define IBUS_Scroll_Lock 0xff14	#define IBUS_Scroll_Lock 0xff14
	#define IBUS_Sys_Req 0xff15	#define IBUS_Sys_Req 0xff15
	#define IBUS_Escape 0xff1b	#define IBUS_Escape 0xff1b

End of changes. 4 change blocks.
	6 lines changed or deleted	6 lines changed or added

	ibuslookuptable.h	ibuslookuptable.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* IBus - The Input Bus	/* IBus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_LOOKUP_TABLE_H_
		#define __IBUS_LOOKUP_TABLE_H_

	/**	/**
	* SECTION: ibuslookuptable	* SECTION: ibuslookuptable
	* @short_description: Candidate word/phrase lookup table.	* @short_description: Candidate word/phrase lookup table.
	* @stability: Stable	* @stability: Stable

	* @see_also: #IBusEngine
	*	*

	* An IBusLookuptable stores the candidate words or phrases for users to ch	* An IBusLookuptable stores the candidate words or phrases for users to
	oose from.	* choose from.
	*	*
	* Use ibus_engine_update_lookup_table(), ibus_engine_show_lookup_table(),	* Use ibus_engine_update_lookup_table(), ibus_engine_show_lookup_table(),
	* and ibus_engine_hide_lookup_table() to update, show and hide the lookup	* and ibus_engine_hide_lookup_table() to update, show and hide the lookup
	* table.	* table.

		*
		* see_also: #IBusEngine
	*/	*/

	#ifndef __IBUS_LOOKUP_TABLE_H_
	#define __IBUS_LOOKUP_TABLE_H_

	#include "ibusserializable.h"	#include "ibusserializable.h"
	#include "ibustext.h"	#include "ibustext.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/
	/* define IBusLookupTable macros */	/* define IBusLookupTable macros */
	#define IBUS_TYPE_LOOKUP_TABLE \	#define IBUS_TYPE_LOOKUP_TABLE \
	(ibus_lookup_table_get_type ())	(ibus_lookup_table_get_type ())

End of changes. 6 change blocks.
	7 lines changed or deleted	9 lines changed or added

	ibusobject.h	ibusobject.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_OBJECT_H_
		#define __IBUS_OBJECT_H_

	/**	/**
	* SECTION: ibusobject	* SECTION: ibusobject
	* @short_description: Base object of IBus.	* @short_description: Base object of IBus.
	* @title: IBusObject	* @title: IBusObject
	* @stability: Stable	* @stability: Stable
	*	*
	* IBusObject is the base object for all objects in IBus.	* IBusObject is the base object for all objects in IBus.
	*/	*/

	#ifndef __IBUS_OBJECT_H_
	#define __IBUS_OBJECT_H_

	#include <glib-object.h>	#include <glib-object.h>
	#include "ibustypes.h"	#include "ibustypes.h"
	#include "ibusdebug.h"	#include "ibusdebug.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	/* define GOBJECT macros */	/* define GOBJECT macros */

	skipping to change at line 93	skipping to change at line 94
	* private to the #IBusObject and should never be accessed directly.	* private to the #IBusObject and should never be accessed directly.
	*/	*/
	struct _IBusObject {	struct _IBusObject {
	GInitiallyUnowned parent;	GInitiallyUnowned parent;
	/* instance members */	/* instance members */
	guint32 flags;	guint32 flags;

	IBusObjectPrivate *priv;	IBusObjectPrivate *priv;
	};	};


	typedef void ( IBusObjectDestroyFunc) (IBusObject );	typedef void ( IBusObjectDestroyFunc) (IBusObject object);

	struct _IBusObjectClass {	struct _IBusObjectClass {
	GInitiallyUnownedClass parent;	GInitiallyUnownedClass parent;

	/* signals */	/* signals */
	void (* destroy) (IBusObject *object);	void (* destroy) (IBusObject *object);

	/< private >/	/< private >/
	/* padding */	/* padding */
	gpointer pdummy[7];	gpointer pdummy[7];

End of changes. 4 change blocks.
	5 lines changed or deleted	6 lines changed or added

	ibusobservedpath.h	ibusobservedpath.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input IBus	/* ibus - The Input IBus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_OBSERVED_PATH_H_
		#define __IBUS_OBSERVED_PATH_H_

	/**	/**
	* SECTION: ibusobservedpath	* SECTION: ibusobservedpath
	* @short_description: Path object of IBus.	* @short_description: Path object of IBus.
	* @stability: Stable	* @stability: Stable
	*	*
	* IBusObservedPath provides methods for file path manipulation,	* IBusObservedPath provides methods for file path manipulation,
	* such as monitor modification, directory tree traversal.	* such as monitor modification, directory tree traversal.
	*/	*/


	#ifndef __IBUS_OBSERVED_PATH_H_
	#define __IBUS_OBSERVED_PATH_H_

	#include "ibusserializable.h"	#include "ibusserializable.h"
	#include "ibusxml.h"	#include "ibusxml.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	/* define GOBJECT macros */	/* define GOBJECT macros */
	#define IBUS_TYPE_OBSERVED_PATH \	#define IBUS_TYPE_OBSERVED_PATH \
	(ibus_observed_path_get_type ())	(ibus_observed_path_get_type ())

	skipping to change at line 120	skipping to change at line 120
	*	*
	* New an IBusObservedPath from an XML node.	* New an IBusObservedPath from an XML node.
	*/	*/
	IBusObservedPath ibus_observed_path_new (const gchar path,	IBusObservedPath ibus_observed_path_new (const gchar path,
	gboolean fill_stat);	gboolean fill_stat);

	/**	/**
	* ibus_observed_path_traverse:	* ibus_observed_path_traverse:
	* @path: An IBusObservedPath.	* @path: An IBusObservedPath.
	* @dir_only: Only looks for subdirs, not files	* @dir_only: Only looks for subdirs, not files

	* @returns: (element-type IBusObservedPath): A newly allocate GList which	* @returns: (transfer full) (element-type IBusObservedPath): A newly alloc
	holds content in path; NULL if @path is not directory.	ate
		* GList which holds content in path; NULL if @path is not directory.
	*	*

	* Recursively traverse the path and put the files and subdirectory in to a	* Recursively traverse the path and put the files and subdirectory in to
	newly allocated	* a newly allocated
	* GLists, if the @path is a directory. Otherwise returns NULL.	* GLists, if the @path is a directory. Otherwise returns NULL.
	*/	*/
	GList ibus_observed_path_traverse (IBusObservedPa th path,	GList ibus_observed_path_traverse (IBusObservedPa th path,
	gboolean dir_only);	gboolean dir_only);

	/**	/**
	* ibus_observed_path_check_modification:	* ibus_observed_path_check_modification:
	* @path: An IBusObservedPath.	* @path: An IBusObservedPath.
	* @returns: TRUE if mtime is changed; FALSE otherwise.	* @returns: TRUE if mtime is changed; FALSE otherwise.
	*	*

End of changes. 5 change blocks.
	9 lines changed or deleted	10 lines changed or added

	ibusproplist.h	ibusproplist.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* IBus - The Input Bus	/* IBus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_PROP_LIST_H_
		#define __IBUS_PROP_LIST_H_

	/**	/**
	* SECTION: ibusproplist	* SECTION: ibusproplist
	* @Title: IBusPropList	* @Title: IBusPropList
	* @Short_description: An #IBusProperty container.	* @Short_description: An #IBusProperty container.
	* @Stability: Stable	* @Stability: Stable
	*	*

	* @See_also: #IBusProperty, #IBusEngine	* See_also: #IBusProperty, #IBusEngine
	*	*
	*/	*/

	#ifndef __IBUS_PROP_LIST_H_
	#define __IBUS_PROP_LIST_H_

	#include "ibusserializable.h"	#include "ibusserializable.h"
	#include "ibusproperty.h"	#include "ibusproperty.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/*	/*
	* Type macros.	* Type macros.
	*/	*/
	/* define IBusPropList macros */	/* define IBusPropList macros */

End of changes. 4 change blocks.
	5 lines changed or deleted	6 lines changed or added

	ibusproxy.h	ibusproxy.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_PROXY_H_
		#define __IBUS_PROXY_H_

	/**	/**
	* SECTION: ibusproxy	* SECTION: ibusproxy
	* @short_description: Base proxy object.	* @short_description: Base proxy object.
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusProxy is the base of all proxy objects,	* An IBusProxy is the base of all proxy objects,

	* which communicate the corresponding #IBusServices on the other end of IB	* which communicate the corresponding #IBusServices on the other end of
	usConnection.	* IBusConnection.
	* For example, IBus clients (such as editors, web browsers) invoke the pro	* For example, IBus clients (such as editors, web browsers) invoke the pro
	xy object,	xy
	* IBusInputContext to communicate with the InputContext service of the ibu	* object,
	s-daemon.	* IBusInputContext to communicate with the InputContext service of the
		* ibus-daemon.
	*	*
	* Almost all services have corresponding proxies, except very simple servi ces.	* Almost all services have corresponding proxies, except very simple servi ces.
	*/	*/

	#ifndef __IBUS_PROXY_H_
	#define __IBUS_PROXY_H_

	#include <gio/gio.h>	#include <gio/gio.h>

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	/* define GOBJECT macros */	/* define GOBJECT macros */
	#define IBUS_TYPE_PROXY \	#define IBUS_TYPE_PROXY \
	(ibus_proxy_get_type ())	(ibus_proxy_get_type ())

End of changes. 4 change blocks.
	10 lines changed or deleted	12 lines changed or added

	ibusserializable.h	ibusserializable.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_SERIALIZABLE_H_
		#define __IBUS_SERIALIZABLE_H_

	/**	/**
	* SECTION: ibusserializable	* SECTION: ibusserializable
	* @short_description: A serializable object.	* @short_description: A serializable object.
	* @stability: Stable	* @stability: Stable
	*	*
	* An #IBusSerializable is an IBus object which can be serialized, that is,	* An #IBusSerializable is an IBus object which can be serialized, that is,
	* to be to and from a #GVariant.	* to be to and from a #GVariant.
	*	*
	* This class is to be extended by other class that requires serialization.	* This class is to be extended by other class that requires serialization.
	* An extended class should overrides following methods:	* An extended class should overrides following methods:

	skipping to change at line 51	skipping to change at line 54
	* <listitem>	* <listitem>
	* <para><function>deserialize(object,iter)</function>: for deseriali ze.</para>	* <para><function>deserialize(object,iter)</function>: for deseriali ze.</para>
	* </listitem>	* </listitem>
	* <listitem>	* <listitem>
	* <para><function>copy(desc,src)</function>: for copy between IBusSe rializable.</para>	* <para><function>copy(desc,src)</function>: for copy between IBusSe rializable.</para>
	* </listitem>	* </listitem>
	* </itemizedlist>	* </itemizedlist>
	* See IBusSerializableSerializeFunc(), IBusSerializableDeserializeFunc(), IBusSerializableCopyFunc()	* See IBusSerializableSerializeFunc(), IBusSerializableDeserializeFunc(), IBusSerializableCopyFunc()
	* for function prototype.	* for function prototype.
	*/	*/

	#ifndef __IBUS_SERIALIZABLE_H_
	#define __IBUS_SERIALIZABLE_H_

	#include "ibusobject.h"	#include "ibusobject.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	/* define IBusSerializable macros */	/* define IBusSerializable macros */
	#define IBUS_TYPE_SERIALIZABLE \	#define IBUS_TYPE_SERIALIZABLE \
	(ibus_serializable_get_type ())	(ibus_serializable_get_type ())

End of changes. 3 change blocks.
	4 lines changed or deleted	5 lines changed or added

	ibusservice.h	ibusservice.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_SERVICE_H_
		#define __IBUS_SERVICE_H_

	/**	/**
	* SECTION: ibusservice	* SECTION: ibusservice
	* @short_description: IBus service back-end.	* @short_description: IBus service back-end.
	* @stability: Stable	* @stability: Stable
	*	*
	* An IBusService is a base class for services.	* An IBusService is a base class for services.
	*/	*/


	#ifndef __IBUS_SERVICE_H_
	#define __IBUS_SERVICE_H_

	#include <gio/gio.h>	#include <gio/gio.h>
	#include "ibusobject.h"	#include "ibusobject.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/

	/* define GOBJECT macros */	/* define GOBJECT macros */
	#define IBUS_TYPE_SERVICE \	#define IBUS_TYPE_SERVICE \
	(ibus_service_get_type ())	(ibus_service_get_type ())

	skipping to change at line 178	skipping to change at line 178
	* ibus_service_send_signal:	* ibus_service_send_signal:
	* @service: An IBusService.	* @service: An IBusService.
	* @interface: The interface the signal is emitted from.	* @interface: The interface the signal is emitted from.
	* @name: Name of the signal.	* @name: Name of the signal.
	* @first_arg_type: Type of first argument.	* @first_arg_type: Type of first argument.
	* @...: Rest of arguments, NULL to mark the end.	* @...: Rest of arguments, NULL to mark the end.
	* @returns: TRUE if succeed; FALSE otherwise.	* @returns: TRUE if succeed; FALSE otherwise.
	*	*
	* Send signal to all the IBusConnections of an IBusService.	* Send signal to all the IBusConnections of an IBusService.
	*	*

	* @see_also: g_dbus_connection_emit_signal()	* see_also: g_dbus_connection_emit_signal()
	*/	*/
	gboolean ibus_service_emit_signal (IBusService *servic e,	gboolean ibus_service_emit_signal (IBusService *servic e,
	const gchar *dest_b us_name,	const gchar *dest_b us_name,
	const gchar *interf ace_name,	const gchar *interf ace_name,
	const gchar *signal _name,	const gchar *signal _name,
	GVariant *parame ters,	GVariant *parame ters,
	GError **error) ;	GError **error) ;
	/**	/**
	* ibus_service_class_add_interfaces:	* ibus_service_class_add_interfaces:
	* @klass: An IBusServiceClass.	* @klass: An IBusServiceClass.

End of changes. 4 change blocks.
	6 lines changed or deleted	6 lines changed or added

	ibusshare.h	ibusshare.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* ibus - The Input Bus	/* ibus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_SHARE_H_
		#define __IBUS_SHARE_H_

	/**	/**
	* SECTION: ibusshare	* SECTION: ibusshare
	* @short_description: Shared utility functions and definition.	* @short_description: Shared utility functions and definition.
	* @stability: Stable	* @stability: Stable
	*	*
	* This file defines some utility functions and definition	* This file defines some utility functions and definition
	* which are shared among ibus component and services.	* which are shared among ibus component and services.
	*/	*/


	#ifndef __IBUS_SHARE_H_
	#define __IBUS_SHARE_H_

	#include <glib.h>	#include <glib.h>

	#ifdef IBUS_DISABLE_DEPRECATION_WARNINGS	#ifdef IBUS_DISABLE_DEPRECATION_WARNINGS
	#define IBUS_DEPRECATED	#define IBUS_DEPRECATED
	#else	#else
	#define IBUS_DEPRECATED G_DEPRECATED	#define IBUS_DEPRECATED G_DEPRECATED
	#endif	#endif

	/**	/**
	* IBUS_SERVICE_IBUS:	* IBUS_SERVICE_IBUS:

End of changes. 3 change blocks.
	5 lines changed or deleted	5 lines changed or added

	ibustext.h	ibustext.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* IBus - The Input Bus	/* IBus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_TEXT_H_
		#define __IBUS_TEXT_H_

	/**	/**
	* SECTION: ibustext	* SECTION: ibustext
	* @short_description: Text with decorating information.	* @short_description: Text with decorating information.

	* @see_also: #IBusAttribute
	*	*
	* An IBusText is the main text object in IBus.	* An IBusText is the main text object in IBus.
	* The text is decorated according to associated IBusAttribute,	* The text is decorated according to associated IBusAttribute,
	* e.g. the foreground/background color, underline, and	* e.g. the foreground/background color, underline, and
	* applied scope.	* applied scope.

		*
		* see_also: #IBusAttribute
	*/	*/


	#ifndef __IBUS_TEXT_H_
	#define __IBUS_TEXT_H_

	#include "ibusserializable.h"	#include "ibusserializable.h"
	#include "ibusattrlist.h"	#include "ibusattrlist.h"

	/*	/*
	* Type macros.	* Type macros.
	*/	*/
	/* define IBusText macros */	/* define IBusText macros */
	#define IBUS_TYPE_TEXT \	#define IBUS_TYPE_TEXT \
	(ibus_text_get_type ())	(ibus_text_get_type ())
	#define IBUS_TEXT(obj) \	#define IBUS_TEXT(obj) \

End of changes. 5 change blocks.
	6 lines changed or deleted	7 lines changed or added

	ibustypes.h	ibustypes.h

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_TYPES_H_
		#define __IBUS_TYPES_H_

	/**	/**
	* SECTION: ibustypes	* SECTION: ibustypes
	* @short_description: Generic types for IBus.	* @short_description: Generic types for IBus.
	* @stability: Stable	* @stability: Stable
	*	*

	* This section consists generic types for IBus, including shift/control ke	* This section consists generic types for IBus, including shift/control ke
	y modifiers,	y
		* modifiers,
	* and a rectangle structure.	* and a rectangle structure.
	*/	*/

	#ifndef __IBUS_TYPES_H_
	#define __IBUS_TYPES_H_

	/**	/**
	* IBusModifierType:	* IBusModifierType:
	* @IBUS_SHIFT_MASK: Shift is activated.	* @IBUS_SHIFT_MASK: Shift is activated.
	* @IBUS_LOCK_MASK: Cap Lock is locked.	* @IBUS_LOCK_MASK: Cap Lock is locked.
	* @IBUS_CONTROL_MASK: Control key is activated.	* @IBUS_CONTROL_MASK: Control key is activated.
	* @IBUS_MOD1_MASK: Modifier 1 (Usually Alt_L (0x40), Alt_R (0x6c), Meta_ L (0xcd)) activated.	* @IBUS_MOD1_MASK: Modifier 1 (Usually Alt_L (0x40), Alt_R (0x6c), Meta_ L (0xcd)) activated.
	* @IBUS_MOD2_MASK: Modifier 2 (Usually Num_Lock (0x4d)) activated.	* @IBUS_MOD2_MASK: Modifier 2 (Usually Num_Lock (0x4d)) activated.
	* @IBUS_MOD3_MASK: Modifier 3 activated.	* @IBUS_MOD3_MASK: Modifier 3 activated.
	* @IBUS_MOD4_MASK: Modifier 4 (Usually Super_L (0xce), Hyper_L (0xcf)) ac tivated.	* @IBUS_MOD4_MASK: Modifier 4 (Usually Super_L (0xce), Hyper_L (0xcf)) ac tivated.

End of changes. 3 change blocks.
	4 lines changed or deleted	6 lines changed or added

	ibusutil.h	ibusutil.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* bus - The Input Bus	/* bus - The Input Bus

	* Copyright (C) 2008-2011 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2010-2011 Takao Fujiwara <takao.fujiwara1@gmail.com>	* Copyright (C) 2010-2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
	* Copyright (C) 2008-2011 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 28	skipping to change at line 28
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_UTIL_H_
		#define __IBUS_UTIL_H_

	/**	/**
	* SECTION: ibusutil	* SECTION: ibusutil
	* @short_description: Utilities with C-Language.	* @short_description: Utilities with C-Language.
	* @stability: Unstable	* @stability: Unstable
	*	*
	* Utilized functions are available for miscellaneous purposes.	* Utilized functions are available for miscellaneous purposes.
	*/	*/


	#ifndef __IBUS_UTIL_H_
	#define __IBUS_UTIL_H_

	/**	/**
	* ibus_get_language_name:	* ibus_get_language_name:
	* @_locale: A const locale name.	* @_locale: A const locale name.
	* @returns: language name	* @returns: language name
	*/	*/
	const gchar * ibus_get_language_name (const gchar *_locale);	const gchar * ibus_get_language_name (const gchar *_locale);

	#endif	#endif

End of changes. 3 change blocks.
	6 lines changed or deleted	6 lines changed or added

	ibusversion.h	ibusversion.h

	skipping to change at line 21	skipping to change at line 21
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.
	*	*
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/


		#ifndef __IBUS_VERSION_H_
		#define __IBUS_VERSION_H_

	/**	/**
	* SECTION: ibusversion	* SECTION: ibusversion
	* @short_description: Current version of IBus.	* @short_description: Current version of IBus.
	* @stability: Stable	* @stability: Stable
	*	*
	* IBusVersion shows the current IBus version.	* IBusVersion shows the current IBus version.
	*/	*/


	#ifndef __IBUS_VERSION_H_
	#define __IBUS_VERSION_H_
	/* compile time version	/* compile time version
	*/	*/
	/**	/**
	* IBUS_MAJOR_VERSION:	* IBUS_MAJOR_VERSION:
	*	*
	* IBus major version.	* IBus major version.
	*/	*/
	#define IBUS_MAJOR_VERSION (1)	#define IBUS_MAJOR_VERSION (1)

	/**	/**

	skipping to change at line 52	skipping to change at line 54
	*	*
	* IBus minor version.	* IBus minor version.
	*/	*/
	#define IBUS_MINOR_VERSION (5)	#define IBUS_MINOR_VERSION (5)

	/**	/**
	* IBUS_MICRO_VERSION:	* IBUS_MICRO_VERSION:
	*	*
	* IBus micro version.	* IBus micro version.
	*/	*/

	#define IBUS_MICRO_VERSION (4)	#define IBUS_MICRO_VERSION (5)

	/**	/**
	* IBUS_CHECK_VERSION:	* IBUS_CHECK_VERSION:
	* @major: Major version of ibus.	* @major: Major version of ibus.
	* @minor: Minor version of ibus.	* @minor: Minor version of ibus.
	* @micro: Micro version of ibus.	* @micro: Micro version of ibus.
	*	*
	* Check whether the current IBus version is equal to or greater than	* Check whether the current IBus version is equal to or greater than
	* given major.minor.micro.	* given major.minor.micro.
	*/	*/

End of changes. 3 change blocks.
	3 lines changed or deleted	5 lines changed or added

	ibusxml.h	ibusxml.h
	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */	/* -- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -- */
	/* vim:set et sts=4: */	/* vim:set et sts=4: */
	/* bus - The Input Bus	/* bus - The Input Bus

	* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2013 Red Hat, Inc.
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1
	* USA	* USA
	*/	*/

	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)	#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
	#error "Only <ibus.h> can be included directly"	#error "Only <ibus.h> can be included directly"
	#endif	#endif


		#ifndef __IBUS_XML_H__
		#define __IBUS_XML_H__

	/**	/**
	* SECTION: ibusxml	* SECTION: ibusxml
	* @short_description: XML handling functions for IBus.	* @short_description: XML handling functions for IBus.
	* @stability: Stable	* @stability: Stable
	*	*
	* IBusXML lists data structure and handling function for XML in IBus.	* IBusXML lists data structure and handling function for XML in IBus.
	*/	*/

	#ifndef __IBUS_XML_H__
	#define __IBUS_XML_H__

	#include <glib.h>	#include <glib.h>

	/**	/**
	* XMLNode:	* XMLNode:
	* @name: Name of XML tag.	* @name: Name of XML tag.
	* @text: Text enclosed by XML start tag and end tag. i.e. <tag>text</tag>.	* @text: Text enclosed by XML start tag and end tag. i.e. <tag>text</tag>.
	* @attributes: Attributes of the XML node.	* @attributes: Attributes of the XML node.
	* @sub_nodes: Children node of this XML node.	* @sub_nodes: Children node of this XML node.
	*	*

End of changes. 3 change blocks.
	4 lines changed or deleted	5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/