IBus: headers diff between 1.5.3 and 1.5.4 versions

	ibus.h	ibus.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-2013 Peng Huang <shawn.p.huang@gmail.com>	* Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2013 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 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.
	*	*
	* 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	* License along with this library; if not, write to the Free Software
	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	* Boston, MA 02111-1307, USA.	1
		* USA
	*/	*/

	#ifndef __IBUS_H_	#ifndef __IBUS_H_
	#define __IBUS_H_	#define __IBUS_H_

	#define __IBUS_H_INSIDE__	#define __IBUS_H_INSIDE__

	#include <ibusversion.h>	#include <ibusversion.h>
	#include <ibusshare.h>	#include <ibusshare.h>
	#include <ibusobject.h>	#include <ibusobject.h>

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

	ibusengine.h	ibusengine.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 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.
	*	*
	* 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	* License along with this library; if not, write to the Free Software
	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	* Boston, MA 02111-1307, USA.	1
		* 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

	/**	/**
	* SECTION: ibusengine	* SECTION: ibusengine
	* @short_description: Input method engine abstract.	* @short_description: Input method engine abstract.
	* @title: IBusEngine	* @title: IBusEngine

	skipping to change at line 76	skipping to change at line 76
	typedef struct _IBusEngine IBusEngine;	typedef struct _IBusEngine IBusEngine;
	typedef struct _IBusEngineClass IBusEngineClass;	typedef struct _IBusEngineClass IBusEngineClass;
	typedef struct _IBusEnginePrivate IBusEnginePrivate;	typedef struct _IBusEnginePrivate IBusEnginePrivate;

	/**	/**
	* IBusEngine:	* IBusEngine:
	* @enabled: Whether the engine is enabled.	* @enabled: Whether the engine is enabled.
	* @has_focus: Whether the engine has focus.	* @has_focus: Whether the engine has focus.
	* @cursor_area: Area of cursor.	* @cursor_area: Area of cursor.
	* @client_capabilities: IBusCapabilite (client capabilities) flags.	* @client_capabilities: IBusCapabilite (client capabilities) flags.

		* @client_purpose: IBusInputPurpose (client input purpose).
		* @client_hints: IBusInputHints (client input hints) flags.
	*	*
	* IBusEngine properties.	* IBusEngine properties.
	*/	*/
	struct _IBusEngine {	struct _IBusEngine {
	/< private >/	/< private >/
	IBusService parent;	IBusService parent;
	IBusEnginePrivate *priv;	IBusEnginePrivate *priv;

	/* instance members */	/* instance members */
	/< public >/	/< public >/

	skipping to change at line 151	skipping to change at line 153
	IBusText *text,	IBusText *text,
	guint cursor_index,	guint cursor_index,
	guint anchor_pos);	guint anchor_pos);
	void (* process_hand_writing_event)	void (* process_hand_writing_event)
	(IBusEngine *engine,	(IBusEngine *engine,
	const gdouble *coordinates,	const gdouble *coordinates,
	guint coordinates_len);	guint coordinates_len);
	void (* cancel_hand_writing)	void (* cancel_hand_writing)
	(IBusEngine *engine,	(IBusEngine *engine,
	guint n_strokes);	guint n_strokes);

		void (* set_content_type)
		(IBusEngine *engine,
		guint purpose,
		guint hints);

	/< private >/	/< private >/
	/* padding */	/* padding */

	gpointer pdummy[5];	gpointer pdummy[4];
	};	};

	GType ibus_engine_get_type (void);	GType ibus_engine_get_type (void);

	/**	/**
	* ibus_engine_new:	* ibus_engine_new:
	* @engine_name: Name of the IBusObject.	* @engine_name: Name of the IBusObject.
	* @object_path: Path for IBusService.	* @object_path: Path for IBusService.
	* @connection: An opened GDBusConnection.	* @connection: An opened GDBusConnection.
	* @returns: A newly allocated IBusEngine.	* @returns: A newly allocated IBusEngine.

	skipping to change at line 425	skipping to change at line 431
	* @cursor_pos: (out) (allow-none): Cursor position in characters in @text.	* @cursor_pos: (out) (allow-none): Cursor position in characters in @text.
	* @anchor_pos: (out) (allow-none): Anchor position of selection in @text.	* @anchor_pos: (out) (allow-none): Anchor position of selection in @text.
	*	*
	* Get surrounding text.	* Get surrounding text.
	*	*
	* It is also used to tell the input-context that the engine will	* It is also used to tell the input-context that the engine will
	* utilize surrounding-text. In that case, it must be called in	* utilize surrounding-text. In that case, it must be called in
	* #IBusEngine::enable handler, with both @text and @cursor set to	* #IBusEngine::enable handler, with both @text and @cursor set to
	* %NULL.	* %NULL.
	*	*

	* see_also #IBusEngine::set-surrounding-text	* See also: #IBusEngine::set-surrounding-text
		*/
		void ibus_engine_get_surrounding_text (IBusEngine *engine,
		IBusText **text,
		guint *cursor_pos,
		guint *anchor_pos);

		/**
		* ibus_engine_get_content_type:
		* @engine: An #IBusEngine.
		* @purpose: (out) (allow-none): Primary purpose of the input context.
		* @hints: (out) (allow-none): Hints that augument @purpose.
		*
		* Get content-type (primary purpose and hints) of the current input
		* context.
		*
		* See also: #IBusEngine::set-content-type
	*/	*/

	void ibus_engine_get_surrounding_text(IBusEngine *engine,	void ibus_engine_get_content_type (IBusEngine *engine,
	IBusText **text,	guint *purpose,
	guint *cursor_pos,	guint *hints);
	guint *anchor_pos);

	/**	/**
	* ibus_engine_get_name:	* ibus_engine_get_name:
	* @engine: An IBusEngine.	* @engine: An IBusEngine.
	* @returns: Name of IBusEngine.	* @returns: Name of IBusEngine.
	*	*
	* Return the name of IBusEngine.	* Return the name of IBusEngine.
	*/	*/
	const gchar ibus_engine_get_name (IBusEngine engine);	const gchar ibus_engine_get_name (IBusEngine engine);


End of changes. 9 change blocks.
	13 lines changed or deleted	35 lines changed or added

	ibusenumtypes.h	ibusenumtypes.h

	skipping to change at line 220	skipping to change at line 220
	*/	*/
	GType ibus_error_get_type (void) G_GNUC_CONST;	GType ibus_error_get_type (void) G_GNUC_CONST;

	/**	/**
	* IBUS_TYPE_ERROR:	* IBUS_TYPE_ERROR:
	* @returns: GType of IBUS_ERROR	* @returns: GType of IBUS_ERROR
	*	*
	* Returns the type of IBUS_ERROR as GType.	* Returns the type of IBUS_ERROR as GType.
	*/	*/
	#define IBUS_TYPE_ERROR (ibus_error_get_type ())	#define IBUS_TYPE_ERROR (ibus_error_get_type ())

		/**
		* ibus_input_purpose_get_type:
		* @returns: GType of IBUS_INPUT_PURPOSE
		*
		* Returns the type of IBUS_INPUT_PURPOSE as GType.
		*/
		GType ibus_input_purpose_get_type (void) G_GNUC_CONST;

		/**
		* IBUS_TYPE_INPUT_PURPOSE:
		* @returns: GType of IBUS_INPUT_PURPOSE
		*
		* Returns the type of IBUS_INPUT_PURPOSE as GType.
		*/
		#define IBUS_TYPE_INPUT_PURPOSE (ibus_input_purpose_get_type ())
		/**
		* ibus_input_hints_get_type:
		* @returns: GType of IBUS_INPUT_HINTS
		*
		* Returns the type of IBUS_INPUT_HINTS as GType.
		*/
		GType ibus_input_hints_get_type (void) G_GNUC_CONST;

		/**
		* IBUS_TYPE_INPUT_HINTS:
		* @returns: GType of IBUS_INPUT_HINTS
		*
		* Returns the type of IBUS_INPUT_HINTS as GType.
		*/
		#define IBUS_TYPE_INPUT_HINTS (ibus_input_hints_get_type ())
	G_END_DECLS	G_END_DECLS

	#endif /* __IBUS_ENUM_TYPES_H__ */	#endif /* __IBUS_ENUM_TYPES_H__ */

	/* Generated data ends here */	/* Generated data ends here */

End of changes. 1 change blocks.
	0 lines changed or deleted	30 lines changed or added

	ibusinputcontext.h	ibusinputcontext.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 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.
	*	*
	* 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	* License along with this library; if not, write to the Free Software
	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	* Boston, MA 02111-1307, USA.	1
		* 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_INPUT_CONTEXT_H_	#ifndef __IBUS_INPUT_CONTEXT_H_
	#define __IBUS_INPUT_CONTEXT_H_	#define __IBUS_INPUT_CONTEXT_H_

	/**	/**

	skipping to change at line 449	skipping to change at line 449
	* ibus_input_context_needs_surrounding_text:	* ibus_input_context_needs_surrounding_text:
	* @context: An #IBusInputContext.	* @context: An #IBusInputContext.
	* @returns: %TRUE if surrounding-text is needed by the current engine;	* @returns: %TRUE if surrounding-text is needed by the current engine;
	* %FALSE otherwise.	* %FALSE otherwise.
	*	*
	* Check whether the current engine requires surrounding-text.	* Check whether the current engine requires surrounding-text.
	*/	*/
	gboolean ibus_input_context_needs_surrounding_text	gboolean ibus_input_context_needs_surrounding_text
	(IBusInputContext *context);	(IBusInputContext *context);


		/**
		* ibus_input_context_set_content_type:
		* @context: An #IBusInputContext.
		* @purpose: Primary purpose of the input context, as an #IBusInputPurpose.
		* @hints: Hints that augment @purpose, as an #IBusInputHints.
		*
		* Set content-type (primary purpose and hints) of the context. This
		* information is particularly useful to implement intelligent
		* behavior in engines, such as automatic input-mode switch and text
		* prediction. For example, to restrict input to numbers, the client
		* can call this function with @purpose set to
		* #IBUS_INPUT_PURPOSE_NUMBER.
		*
		* See also: #IBusEngine::set-content-type
		*/
		void ibus_input_context_set_content_type
		(IBusInputContext *context,
		guint purpose,
		guint hints);

	G_END_DECLS	G_END_DECLS
	#endif	#endif

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

	ibuskeys.h	ibuskeys.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 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2011 Google, Inc.	* Copyright (C) 2011 Google, 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 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.
	*	*
	* 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	* License along with this library; if not, write to the Free Software
	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	* Boston, MA 02111-1307, USA.	1
		* 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_KEYS_H_	#ifndef __IBUS_KEYS_H_
	#define __IBUS_KEYS_H_	#define __IBUS_KEYS_H_

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

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

	ibuspanelservice.h	ibuspanelservice.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) 2009, Google Inc. All rights reserved.	* Copyright (c) 2009-2013 Google Inc. All rights reserved.
	*	*
	* 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 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.
	*	*
	* 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	* License along with this library; if not, write to the Free Software
	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	* Boston, MA 02111-1307, USA.	1
		* 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_PANEL_SERVICE_H_	#ifndef __IBUS_PANEL_SERVICE_H_
	#define __IBUS_PANEL_SERVICE_H_	#define __IBUS_PANEL_SERVICE_H_

	/**	/**

	skipping to change at line 79	skipping to change at line 79
	struct _IBusPanelService {	struct _IBusPanelService {
	IBusService parent;	IBusService parent;
	/* instance members */	/* instance members */
	};	};

	struct _IBusPanelServiceClass {	struct _IBusPanelServiceClass {
	IBusServiceClass parent;	IBusServiceClass parent;

	/* class members */	/* class members */
	void (* focus_in) (IBusPanelService *panel,	void (* focus_in) (IBusPanelService *panel,

	const gchar *input_c	const gchar
	ontext_path);	*input_context_path);
	void (* focus_out) (IBusPanelService *panel,	void (* focus_out) (IBusPanelService *panel,

	const gchar *input_c	const gchar
	ontext_path);	*input_context_path);
	void (* register_properties) (IBusPanelService *panel,	void (* register_properties) (IBusPanelService *panel,
	IBusPropList *prop_li st);	IBusPropList *prop_li st);
	void (* set_cursor_location) (IBusPanelService *panel,	void (* set_cursor_location) (IBusPanelService *panel,
	gint x,	gint x,
	gint y,	gint y,
	gint w,	gint w,
	gint h);	gint h);
	void (* update_auxiliary_text) (IBusPanelService *panel,	void (* update_auxiliary_text) (IBusPanelService *panel,
	IBusText *text,	IBusText *text,
	gboolean visible );	gboolean visible );
	void (* update_lookup_table) (IBusPanelService *panel,	void (* update_lookup_table) (IBusPanelService *panel,
	IBusLookupTable *lookup_ table,	IBusLookupTable *lookup_ table,
	gboolean visible );	gboolean visible );
	void (* update_preedit_text) (IBusPanelService *panel,	void (* update_preedit_text) (IBusPanelService *panel,

	IBusText *text,	IBusText *text,
	guint cursor_p os,	guint cursor_p os,
	gboolean visible) ;	gboolean visible) ;
	void (* update_property) (IBusPanelService *panel,	void (* update_property) (IBusPanelService *panel,
	IBusProperty *prop);	IBusProperty *prop);
	void (* cursor_down_lookup_table) (IBusPanelService *panel);	void (* cursor_down_lookup_table) (IBusPanelService *panel);
	void (* cursor_up_lookup_table) (IBusPanelService *panel);	void (* cursor_up_lookup_table) (IBusPanelService *panel);
	void (* hide_auxiliary_text) (IBusPanelService *panel);	void (* hide_auxiliary_text) (IBusPanelService *panel);
	void (* hide_language_bar) (IBusPanelService *panel);	void (* hide_language_bar) (IBusPanelService *panel);
	void (* hide_lookup_table) (IBusPanelService *panel);	void (* hide_lookup_table) (IBusPanelService *panel);
	void (* hide_preedit_text) (IBusPanelService *panel);	void (* hide_preedit_text) (IBusPanelService *panel);
	void (* page_down_lookup_table) (IBusPanelService *panel);	void (* page_down_lookup_table) (IBusPanelService *panel);
	void (* page_up_lookup_table) (IBusPanelService *panel);	void (* page_up_lookup_table) (IBusPanelService *panel);
	void (* reset) (IBusPanelService *panel);	void (* reset) (IBusPanelService *panel);
	void (* show_auxiliary_text) (IBusPanelService *panel);	void (* show_auxiliary_text) (IBusPanelService *panel);
	void (* show_language_bar) (IBusPanelService *panel);	void (* show_language_bar) (IBusPanelService *panel);
	void (* show_lookup_table) (IBusPanelService *panel);	void (* show_lookup_table) (IBusPanelService *panel);
	void (* show_preedit_text) (IBusPanelService *panel);	void (* show_preedit_text) (IBusPanelService *panel);
	void (* start_setup) (IBusPanelService *panel);	void (* start_setup) (IBusPanelService *panel);
	void (* state_changed) (IBusPanelService *panel);	void (* state_changed) (IBusPanelService *panel);

		void (* destroy_context) (IBusPanelService *panel,
		const gchar
		*input_context_path);

	/< private >/	/< private >/
	/* padding */	/* padding */

	gpointer pdummy[8]; // We can add 8 pointers without breaking the ABI.	gpointer pdummy[7]; // We can add 8 pointers without breaking the ABI.
	};	};

	GType ibus_panel_service_get_type (void);	GType ibus_panel_service_get_type (void);

	/**	/**
	* ibus_panel_service_new:	* ibus_panel_service_new:
	* @connection: An GDBusConnection.	* @connection: An GDBusConnection.
	* @returns: A newly allocated IBusPanelService.	* @returns: A newly allocated IBusPanelService.
	*	*
	* New an IBusPanelService from an GDBusConnection.	* New an IBusPanelService from an GDBusConnection.

End of changes. 9 change blocks.
	12 lines changed or deleted	16 lines changed or added

	ibusproperty.h	ibusproperty.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-2010 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2010 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 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.
	*	*
	* 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	* License along with this library; if not, write to the Free Software
	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	* Boston, MA 02111-1307, USA.	1
		* 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_PROPERTY_H_	#ifndef __IBUS_PROPERTY_H_
	#define __IBUS_PROPERTY_H_	#define __IBUS_PROPERTY_H_

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

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

	ibustypes.h	ibustypes.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 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.
	*	*
	* 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	* License along with this library; if not, write to the Free Software
	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	* Boston, MA 02111-1307, USA.	1
		* 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

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

	skipping to change at line 231	skipping to change at line 231
	};	};

	/**	/**
	* IBusFreeFunc:	* IBusFreeFunc:
	* @object: object to be freed.	* @object: object to be freed.
	*	*
	* Free function prototype.	* Free function prototype.
	*/	*/
	typedef void (* IBusFreeFunc) (gpointer object);	typedef void (* IBusFreeFunc) (gpointer object);


		/**
		* IBusInputPurpose:
		* @IBUS_INPUT_PURPOSE_FREE_FORM: Allow any character
		* @IBUS_INPUT_PURPOSE_ALPHA: Allow only alphabetic characters
		* @IBUS_INPUT_PURPOSE_DIGITS: Allow only digits
		* @IBUS_INPUT_PURPOSE_NUMBER: Edited field expects numbers
		* @IBUS_INPUT_PURPOSE_PHONE: Edited field expects phone number
		* @IBUS_INPUT_PURPOSE_URL: Edited field expects URL
		* @IBUS_INPUT_PURPOSE_EMAIL: Edited field expects email address
		* @IBUS_INPUT_PURPOSE_NAME: Edited field expects the name of a person
		* @IBUS_INPUT_PURPOSE_PASSWORD: Like @IBUS_INPUT_PURPOSE_FREE_FORM,
		* but characters are hidden
		* @IBUS_INPUT_PURPOSE_PIN: Like @IBUS_INPUT_PURPOSE_DIGITS, but
		* characters are hidden
		*
		* Describes primary purpose of the input context. This information
		* is particularly useful to implement intelligent behavior in
		* engines, such as automatic input-mode switch and text prediction.
		*
		* This enumeration may be extended in the future; engines should
		* interpret unknown values as 'free form'.
		*/
		typedef enum
		{
		IBUS_INPUT_PURPOSE_FREE_FORM,
		IBUS_INPUT_PURPOSE_ALPHA,
		IBUS_INPUT_PURPOSE_DIGITS,
		IBUS_INPUT_PURPOSE_NUMBER,
		IBUS_INPUT_PURPOSE_PHONE,
		IBUS_INPUT_PURPOSE_URL,
		IBUS_INPUT_PURPOSE_EMAIL,
		IBUS_INPUT_PURPOSE_NAME,
		IBUS_INPUT_PURPOSE_PASSWORD,
		IBUS_INPUT_PURPOSE_PIN
		} IBusInputPurpose;

		/**
		* IBusInputHints:
		* @IBUS_INPUT_HINT_NONE: No special behaviour suggested
		* @IBUS_INPUT_HINT_SPELLCHECK: Suggest checking for typos
		* @IBUS_INPUT_HINT_NO_SPELLCHECK: Suggest not checking for typos
		* @IBUS_INPUT_HINT_WORD_COMPLETION: Suggest word completion
		* @IBUS_INPUT_HINT_LOWERCASE: Suggest to convert all text to lowercase
		* @IBUS_INPUT_HINT_UPPERCASE_CHARS: Suggest to capitalize all text
		* @IBUS_INPUT_HINT_UPPERCASE_WORDS: Suggest to capitalize the first
		* character of each word
		* @IBUS_INPUT_HINT_UPPERCASE_SENTENCES: Suggest to capitalize the
		* first word of each sentence
		* @IBUS_INPUT_HINT_INHIBIT_OSK: Suggest to not show an onscreen keyboard
		* (e.g for a calculator that already has all the keys).
		*
		* Describes hints that might be taken into account by engines. Note
		* that engines may already tailor their behaviour according to the
		* #IBusInputPurpose of the entry.
		*/
		typedef enum
		{
		IBUS_INPUT_HINT_NONE = 0,
		IBUS_INPUT_HINT_SPELLCHECK = 1 << 0,
		IBUS_INPUT_HINT_NO_SPELLCHECK = 1 << 1,
		IBUS_INPUT_HINT_WORD_COMPLETION = 1 << 2,
		IBUS_INPUT_HINT_LOWERCASE = 1 << 3,
		IBUS_INPUT_HINT_UPPERCASE_CHARS = 1 << 4,
		IBUS_INPUT_HINT_UPPERCASE_WORDS = 1 << 5,
		IBUS_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
		IBUS_INPUT_HINT_INHIBIT_OSK = 1 << 7
		} IBusInputHints;

	#endif	#endif

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

	ibusversion.h	ibusversion.h
	/* 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-2010 Peng Huang <shawn.p.huang@gmail.com>
	* Copyright (C) 2008-2010 Red Hat, Inc.	* Copyright (C) 2008-2010 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 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.
	*	*
	* 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	* License along with this library; if not, write to the Free Software
	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	* Boston, MA 02111-1307, USA.	1
		* USA
	*/	*/
	/**	/**
	* 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_	#ifndef __IBUS_VERSION_H_

	skipping to change at line 52	skipping to change at line 52
	*	*
	* 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 (3)	#define IBUS_MICRO_VERSION (4)

	/**	/**
	* 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. 4 change blocks.
	6 lines changed or deleted	7 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/