ibus.h		ibus.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusattribute.h		ibusattribute.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusattrlist.h		ibusattrlist.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 102		skipping to change at line 103
	* @attr: The IBusAttribute instance to be appended.		* @attr: The IBusAttribute instance to be appended.
	*		*
	* Append an IBusAttribute to IBusAttrList, and increase reference.		* Append an IBusAttribute to IBusAttrList, and increase reference.
	*/		*/
	void ibus_attr_list_append (IBusAttrList *attr_list,		void ibus_attr_list_append (IBusAttrList *attr_list,
	IBusAttribute *attr);		IBusAttribute *attr);
	/**		/**
	* ibus_attr_list_get:		* ibus_attr_list_get:
	* @attr_list: An IBusAttrList instance.		* @attr_list: An IBusAttrList instance.
	* @index: Index of the @attr_list.		* @index: Index of the @attr_list.
	* @returns: IBusAttribute at given index, NULL if no such IBusAttribute.		* @returns: (transfer none): IBusAttribute at given index, NULL if no such IBusAttribute.
	*		*
	* Returns IBusAttribute at given index. Borrowed reference.		* Returns IBusAttribute at given index. Borrowed reference.
	*/		*/
	IBusAttribute *ibus_attr_list_get (IBusAttrList *attr_list,		IBusAttribute *ibus_attr_list_get (IBusAttrList *attr_list,
	guint index);		guint index);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	ibusbus.h		ibusbus.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 31		skipping to change at line 32
	/**		/**
	* SECTION: ibusbus		* SECTION: ibusbus
	* @short_description: Connect with IBus daemon.		* @short_description: Connect with IBus daemon.
	* @stability: Stable		* @stability: Stable
	*		*
	* An IBusBus connects with IBus daemon.		* An IBusBus connects with IBus daemon.
	*/		*/
	#ifndef __IBUS_BUS_H_		#ifndef __IBUS_BUS_H_
	#define __IBUS_BUS_H_		#define __IBUS_BUS_H_
	#include <dbus/dbus.h>
	#include "ibusinputcontext.h"		#include "ibusinputcontext.h"
	#include "ibusconfig.h"		#include "ibusconfig.h"
	#include "ibuscomponent.h"		#include "ibuscomponent.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
	#define IBUS_TYPE_BUS \		#define IBUS_TYPE_BUS \
	skipping to change at line 77		skipping to change at line 77
	};		};
	struct _IBusBusClass {		struct _IBusBusClass {
	IBusObjectClass parent;		IBusObjectClass parent;
	/* class members */		/* class members */
	};		};
	GType ibus_bus_get_type (void);		GType ibus_bus_get_type (void);
	/**		/**
	* ibus_bus_new:		* ibus_bus_new:
	* @returns: A newly allocated IBusBus instance.		* @returns: A newly allocated IBusBus instance, and the instance is not fl oating.
	*		*
	* New an IBusBus instance.		* New an IBusBus instance.
	*/		*/
	IBusBus *ibus_bus_new (void);		IBusBus *ibus_bus_new (void);
	/**		/**
	* ibus_bus_is_connected:		* ibus_bus_is_connected:
	* @bus: An IBusBus.		* @bus: An IBusBus.
	* @returns: TRUE if @bus is connected, FALSE otherwise.		* @returns: TRUE if @bus is connected, FALSE otherwise.
	*		*
	skipping to change at line 150		skipping to change at line 150
	* @returns: TRUE if the name has owner, FALSE otherwise.		* @returns: TRUE if the name has owner, FALSE otherwise.
	*		*
	* Whether the name has owner.		* Whether the name has owner.
	*/		*/
	gboolean ibus_bus_name_has_owner (IBusBus *bus,		gboolean ibus_bus_name_has_owner (IBusBus *bus,
	const gchar *name);		const gchar *name);
	/**		/**
	* ibus_bus_list_names:		* ibus_bus_list_names:
	* @bus: An IBusBus.		* @bus: An IBusBus.
	* @returns: Lists that attached to @bus.		* @returns: (transfer full) (element-type utf8): Lists that attached to @b us.
	*		*
	* Return lists that attached to @bus.		* Return lists that attached to @bus.
	* <note><para>[FixMe] Not implemented yet, only return NULL.</para></note>		* <note><para>[FixMe] Not implemented yet, only return NULL.</para></note>
	*/		*/
	GList *ibus_bus_list_names (IBusBus *bus);		GList *ibus_bus_list_names (IBusBus *bus);
	/**		/**
	* ibus_bus_add_match:		* ibus_bus_add_match:
	* @bus: An IBusBus.		* @bus: An IBusBus.
	* @rule: Match rule.		* @rule: Match rule.
	skipping to change at line 239		skipping to change at line 239
	* @returns: TRUE if the "RegisterComponent" call is suceeded, FALSE otherw ise.		* @returns: TRUE if the "RegisterComponent" call is suceeded, FALSE otherw ise.
	*		*
	* Register a componet to an IBusBus.		* Register a componet to an IBusBus.
	*/		*/
	gboolean ibus_bus_register_component(IBusBus *bus,		gboolean ibus_bus_register_component(IBusBus *bus,
	IBusComponent *component);		IBusComponent *component);
	/**		/**
	* ibus_bus_list_engines:		* ibus_bus_list_engines:
	* @bus: An IBusBus.		* @bus: An IBusBus.
	* @returns: A GList of engines.		* @returns: (transfer full) (element-type IBusEngineDesc): A List of engin es.
	*		*
	* List engines.		* List engines.
	* Note that this function is not yet implemented.		* Note that this function is not yet implemented.
	*/		*/
	GList *ibus_bus_list_engines (IBusBus *bus);		GList *ibus_bus_list_engines (IBusBus *bus);
	/**		/**
	* ibus_bus_list_active_engines:		* ibus_bus_list_active_engines:
	* @bus: An IBusBus.		* @bus: An IBusBus.
	* @returns: A GList of active engines.		* @returns: (transfer full) (element-type IBusEngineDesc): A List of activ e engines.
	*		*
	* List active engines.		* List active engines.
	* Note that this function is not yet implemented.		* Note that this function is not yet implemented.
	* <note><para>Not yet implemented.</para></note>		* <note><para>Not yet implemented.</para></note>
	*/		*/
	GList *ibus_bus_list_active_engines		GList *ibus_bus_list_active_engines
	(IBusBus *bus);		(IBusBus *bus);
			/**
			* ibus_bus_get_use_sys_layout:
			* @bus: An IBusBus.
			* @returns: TRUE if "use_sys_layout" option is enabled.
			*
			* Check if the bus's "use_sys_layout" option is enabled or not.
			*/
			gboolean ibus_bus_get_use_sys_layout(IBusBus *bus);
			/**
			* ibus_bus_get_use_global_engine:
			* @bus: An IBusBus.
			* @returns: TRUE if "use_global_engine" option is enabled.
			*
			* Check if the bus's "use_global_engine" option is enabled or not.
			*/
			gboolean ibus_bus_get_use_global_engine
			(IBusBus *bus);
			/**
			* ibus_bus_is_global_engine_enabled:
			* @bus: An IBusBus.
			* @returns: TRUE if the current global engine is enabled.
			*
			* Check if the current global engine is enabled or not.
			*/
			gboolean ibus_bus_is_global_engine_enabled
			(IBusBus *bus);
			/**
			* ibus_bus_get_global_engine:
			* @bus: An IBusBus.
			* @returns: The description of current global engine, or NULL if there is
			no
			* global engine.
			*
			* Get the description of current global engine.
			*/
			IBusEngineDesc
			*ibus_bus_get_global_engine (IBusBus *bus);
			/**
			* ibus_bus_set_global_engine:
			* @bus: An IBusBus.
			* @global_engine: A new engine name.
			* @returns: TRUE if the global engine was set successfully.
			*
			* Set current global engine.
			*/
			gboolean ibus_bus_set_global_engine (IBusBus *bus,
			const gchar *global_engine);
	/* declare config apis */		/* declare config apis */
	/**		/**
	* ibus_bus_get_config:		* ibus_bus_get_config:
	* @bus: An IBusBus.		* @bus: An IBusBus.
	* @returns: An newly allocated IBusConfig which is configurable with @bus.		* @returns: An newly allocated IBusConfig which is configurable with @bus.
	*		*
	* Get the config instance from IBusBus.		* Get the config instance from IBusBus.
	*/		*/
	IBusConfig *ibus_bus_get_config (IBusBus *bus);		IBusConfig *ibus_bus_get_config (IBusBus *bus);
End of changes. 7 change blocks.
	5 lines changed or deleted		58 lines changed or added

	ibuscomponent.h		ibuscomponent.h
			/* -*- 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-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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 191		skipping to change at line 192
	* @engine: A description of an engine.		* @engine: A description of an engine.
	*		*
	* Add an engine to IBusComponent according to the description in @engine.		* Add an engine to IBusComponent according to the description in @engine.
	*/		*/
	void ibus_component_add_engine (IBusComponent *component,		void ibus_component_add_engine (IBusComponent *component,
	IBusEngineDesc *engine);		IBusEngineDesc *engine);
	/**		/**
	* ibus_component_get_engines:		* ibus_component_get_engines:
	* @component: An IBusComponent.		* @component: An IBusComponent.
	* @returns: A newly allocated GList that contains engines.		* @returns: (transfer none) (element-type IBusEngineDesc): A newly allocat ed GList that contains engines.
	*		*
	* Get the engines of this component.		* Get the engines of this component.
	*/		*/
	GList *ibus_component_get_engines (IBusComponent *component) ;		GList *ibus_component_get_engines (IBusComponent *component) ;
	/**		/**
	* ibus_component_output:		* ibus_component_output:
	* @component: An IBusComponent.		* @component: An IBusComponent.
	* @output: GString that holds the result.		* @output: GString that holds the result.
	* @indent: level of indent.		* @indent: level of indent.
	skipping to change at line 236		skipping to change at line 237
	* @returns: TRUE if at least one of the observed paths is modified; FALSE otherwise.		* @returns: TRUE if at least one of the observed paths is modified; FALSE otherwise.
	*		*
	* Check whether the observed paths of component is modified.		* Check whether the observed paths of component is modified.
	*/		*/
	gboolean ibus_component_check_modification		gboolean ibus_component_check_modification
	(IBusComponent *component) ;		(IBusComponent *component) ;
	/**		/**
	* ibus_component_start:		* ibus_component_start:
	* @component: An IBusComponent.		* @component: An IBusComponent.
	* @verbose: if redirect the child output to /dev/null		* @verbose: if FALSE, redirect the child output to /dev/null
	* @returns: TRUE if the component is started; FALSE otherwise.		* @returns: TRUE if the component is started; FALSE otherwise.
	*		*
	* Whether the IBusComponent is started.		* Whether the IBusComponent is started.
	*/		*/
	gboolean ibus_component_start (IBusComponent *component,		gboolean ibus_component_start (IBusComponent *component,
	gboolean verbose);		gboolean verbose);
	/**		/**
	* ibus_component_stop:		* ibus_component_stop:
	* @component: An IBusComponent.		* @component: An IBusComponent.
	skipping to change at line 265		skipping to change at line 266
	* @component: An IBusComponent.		* @component: An IBusComponent.
	* @returns: TRUE if the component is running; FALSE otherwise.		* @returns: TRUE if the component is running; FALSE otherwise.
	*		*
	* Whether the IBusComponent is running.		* Whether the IBusComponent is running.
	*/		*/
	gboolean ibus_component_is_running (IBusComponent *component) ;		gboolean ibus_component_is_running (IBusComponent *component) ;
	/**		/**
	* ibus_component_get_from_engine:		* ibus_component_get_from_engine:
	* @engine: A description of an engine.		* @engine: A description of an engine.
	* @returns: An IBusComponent of the engine.		* @returns: (transfer none): An IBusComponent of the engine.
	*		*
	* Get the IBusComponent from an engine description.		* Get the IBusComponent from an engine description.
	*/		*/
	IBusComponent *ibus_component_get_from_engine (IBusEngineDesc *engine);		IBusComponent *ibus_component_get_from_engine (IBusEngineDesc *engine);
			/**
			* ibus_component_set_restart:
			* @component: An IBusComponent.
			* @restart: if TRUE, the component will be restartd when it dies.
			*
			* Set whether the component needs to be restarted when it dies.
			*/
			void ibus_component_set_restart (IBusComponent *component,
			gboolean restart);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	3 lines changed or deleted		14 lines changed or added

	ibusconfig.h		ibusconfig.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusconfigservice.h		ibusconfigservice.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusconnection.h		ibusconnection.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 39		skipping to change at line 40
	* Usually, IBusConnection is set to a #DBusConnection and emitting ibus-me ssage when		* Usually, IBusConnection is set to a #DBusConnection and emitting ibus-me ssage when
	* receiving incoming messages from the #DBusConnection.		* receiving incoming messages from the #DBusConnection.
	*		*
	* @see_also: #IBusMessage		* @see_also: #IBusMessage
	*		*
	*/		*/
	#ifndef __IBUS_CONNECTION_H_		#ifndef __IBUS_CONNECTION_H_
	#define __IBUS_CONNECTION_H_		#define __IBUS_CONNECTION_H_
	#include <dbus/dbus.h>		#include "ibusdbus.h"
	#include "ibusmessage.h"		#include "ibusmessage.h"
	#include "ibuspendingcall.h"		#include "ibuspendingcall.h"
	#include "ibusobject.h"		#include "ibusobject.h"
	#include "ibuserror.h"		#include "ibuserror.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	ibusdebug.h		ibusdebug.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusengine.h		ibusengine.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 35		skipping to change at line 36
	* @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_		#ifndef __IBUS_ENGINE_H_
	#define __IBUS_ENGINE_H_		#define __IBUS_ENGINE_H_
	#include <dbus/dbus.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.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
End of changes. 2 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ibusenginedesc.h		ibusenginedesc.h
			/* -*- 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-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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 80		skipping to change at line 81
	/**		/**
	* IBusEngineDesc:		* IBusEngineDesc:
	* @name: Name of the engine.		* @name: Name of the engine.
	* @longname: Long name of the input method engine.		* @longname: Long name of the input method engine.
	* @description: Input method engine description.		* @description: Input method engine description.
	* @language: Language (e.g. zh, jp) supported by this input method engine.		* @language: Language (e.g. zh, jp) supported by this input method engine.
	* @license: License of the input method engine.		* @license: License of the input method engine.
	* @author: Author of the input method engine.		* @author: Author of the input method engine.
	* @icon: Icon file of this engine.		* @icon: Icon file of this engine.
	* @layout: Keyboard layout		* @layout: Keyboard layout
			* @hotkeys: One or more hotkeys for switching to this engine, separated by
			* semi-colon.
	* @rank: Preference rank among engines, the highest ranked IME will put in		* @rank: Preference rank among engines, the highest ranked IME will put in
	* the front.		* the front.
	*		*
	* Input method engine description data.		* Input method engine description data.
	*/		*/
	struct _IBusEngineDesc {		struct _IBusEngineDesc {
	IBusSerializable parent;		IBusSerializable parent;
	/* instance members */		/* instance members */
	/*< public >*/		/*< public >*/
	gchar *name;		gchar *name;
	gchar *longname;		gchar *longname;
	gchar *description;		gchar *description;
	gchar *language;		gchar *language;
	gchar *license;		gchar *license;
	gchar *author;		gchar *author;
	gchar *icon;		gchar *icon;
	gchar *layout;		gchar *layout;
			gchar *hotkeys;
	guint rank;		guint rank;
	};		};
	struct _IBusEngineDescClass {		struct _IBusEngineDescClass {
	IBusSerializableClass parent;		IBusSerializableClass parent;
	/* class members */		/* class members */
	};		};
	GType ibus_engine_desc_get_type (void);		GType ibus_engine_desc_get_type (void);
	skipping to change at line 130		skipping to change at line 134
	* New a IBusEngineDesc.		* New a IBusEngineDesc.
	*/		*/
	IBusEngineDesc *ibus_engine_desc_new (const gchar *name,		IBusEngineDesc *ibus_engine_desc_new (const gchar *name,
	const gchar *longname,		const gchar *longname,
	const gchar *descriptio n,		const gchar *descriptio n,
	const gchar *language,		const gchar *language,
	const gchar *license,		const gchar *license,
	const gchar *author,		const gchar *author,
	const gchar *icon,		const gchar *icon,
	const gchar *layout);		const gchar *layout);
			/**
			* ibus_engine_desc_new2:
			* @name: Name of the engine.
			* @longname: Long name of the input method engine.
			* @description: Input method engine description.
			* @language: Language (e.g. zh, jp) supported by this input method engine.
			* @license: License of the input method engine.
			* @author: Author of the input method engine.
			* @icon: Icon file of this engine.
			* @layout: Keyboard layout
			* @hotkeys: Hotkeys for switching to this engine.
			* @returns: A newly allocated IBusEngineDesc.
			*
			* New a IBusEngineDesc.
			*/
			IBusEngineDesc *ibus_engine_desc_new2 (const gchar *name,
			const gchar *longname,
			const gchar *descriptio
			n,
			const gchar *language,
			const gchar *license,
			const gchar *author,
			const gchar *icon,
			const gchar *layout,
			const gchar *hotkeys);
	/**		/**
	* ibus_engine_desc_new_from_xml_node:		* ibus_engine_desc_new_from_xml_node:
	* @node: An XML node		* @node: An XML node
	* @returns: A newly allocated IBusEngineDesc that contains description fro m		* @returns: A newly allocated IBusEngineDesc that contains description fro m
	* @node.		* @node.
	*		*
	* New a IBusEngineDesc from an XML node.		* New a IBusEngineDesc from an XML node.
	* <note><para>This function is called by ibus_component_new_from_file(),		* <note><para>This function is called by ibus_component_new_from_file(),
	* so developers normally do not need to call it directly.		* so developers normally do not need to call it directly.
	* </para></note>		* </para></note>
	skipping to change at line 152		skipping to change at line 182
	(XMLNode *node);		(XMLNode *node);
	/**		/**
	* ibus_engine_desc_output:		* ibus_engine_desc_output:
	* @info: An IBusEngineDesc		* @info: An IBusEngineDesc
	* @output: XML-formatted Input method engine description.		* @output: XML-formatted Input method engine description.
	* @indent: Number of indent (showed as 4 spaces).		* @indent: Number of indent (showed as 4 spaces).
	*		*
	* Output XML-formatted input method engine description.		* Output XML-formatted input method engine description.
	* The result will be append to GString specified in @output.		* The result will be append to GString specified in @output.
	*/		*/
	void ibus_engine_desc_output (IBusEngineDesc *info,		void ibus_engine_desc_output (IBusEngineDesc *info,
	GString *output,		GString *output,
	gint indent);		gint indent);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	1 lines changed or deleted		32 lines changed or added

	ibuserror.h		ibuserror.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 33		skipping to change at line 34
	* @short_description: Error message output.		* @short_description: Error message output.
	* @stability: Stable		* @stability: Stable
	*		*
	* An IBusError is actually a #DBusError.		* An IBusError is actually a #DBusError.
	* Functions listed here are convenient wrapper for IBusError new and free.		* Functions listed here are convenient wrapper for IBusError new and free.
	*/		*/
	#ifndef __IBUS_ERROR_H_		#ifndef __IBUS_ERROR_H_
	#define __IBUS_ERROR_H_		#define __IBUS_ERROR_H_
	#include <glib.h>		#include <glib.h>
	#include <dbus/dbus.h>		#include "ibusdbus.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/**		/**
	* IBusError:
	*
	* A data type representing an IBusError.
	* An IBusError is actually a #DBusError.
	*
	* @see_also: #DBusError for detail structure definition.
	*/
	typedef DBusError IBusError;
	/**
	* ibus_error_new:		* ibus_error_new:
	* @returns: A newly allocated IBusError.		* @returns: A newly allocated IBusError.
	*		*
	* New an empty IBusError.		* New an empty IBusError.
	*/		*/
	IBusError *ibus_error_new (void);		IBusError *ibus_error_new (void);
	/**		/**
	* ibus_error_new_from_text:		* ibus_error_new_from_text:
	* @name: The error name.		* @name: The error name.
	skipping to change at line 84		skipping to change at line 75
	*/		*/
	IBusError *ibus_error_new_from_printf (const gchar *name,		IBusError *ibus_error_new_from_printf (const gchar *name,
	const gchar *format_message ,		const gchar *format_message ,
	...);		...);
	/**		/**
	* ibus_error_new_from_message:		* ibus_error_new_from_message:
	* @message: A DBusMessage		* @message: A DBusMessage
	* @returns: A newly allocated IBusError.		* @returns: A newly allocated IBusError.
	*		*
	* New an IBusError from a #DBusMessage.		* New an IBusError from a #IBusMessage.
	*/		*/
	IBusError *ibus_error_new_from_message		IBusError *ibus_error_new_from_message
	(DBusMessage *message);		(IBusMessage *message);
	/**		/**
	* ibus_error_free:		* ibus_error_free:
	* @error: An IBusError		* @error: An IBusError
	*		*
	* Free an IBusError.		* Free an IBusError.
	*/		*/
	void ibus_error_free (IBusError *error);		void ibus_error_free (IBusError *error);
	G_END_DECLS		G_END_DECLS
End of changes. 5 change blocks.
	13 lines changed or deleted		4 lines changed or added

	ibusfactory.h		ibusfactory.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 37		skipping to change at line 38
	* 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_		#ifndef __IBUS_FACTORY_H_
	#define __IBUS_FACTORY_H_		#define __IBUS_FACTORY_H_
	#include <dbus/dbus.h>
	#include "ibusservice.h"		#include "ibusservice.h"
	#include "ibusserializable.h"		#include "ibusserializable.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
End of changes. 2 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ibushotkey.h		ibushotkey.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 163		skipping to change at line 164
	* @see_also: ::trigger		* @see_also: ::trigger
	*/		*/
	GQuark ibus_hotkey_profile_filter_key_event		GQuark ibus_hotkey_profile_filter_key_event
	(IBusHotkeyProfile *profil e,		(IBusHotkeyProfile *profil e,
	guint keyval ,		guint keyval ,
	guint modifi ers,		guint modifi ers,
	guint prev_k eyval,		guint prev_k eyval,
	guint prev_m odifiers,		guint prev_m odifiers,
	gpointer user_d ata);		gpointer user_d ata);
			/**
			* ibus_hotkey_profile_lookup_hotkey:
			* @profile: An IBusHotkeyProfile.
			* @keyval: Keycode of the hotkey.
			* @modifiers: Modifiers of the hotkey.
			* @returns: The event associated to the hotkey or 0 if the hotkey is not i
			n the
			* profile.
			*/
			GQuark ibus_hotkey_profile_lookup_hotkey
			(IBusHotkeyProfile *profil
			e,
			guint keyval
			,
			guint modifi
			ers);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		18 lines changed or added

	ibusinputcontext.h		ibusinputcontext.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 265		skipping to change at line 266
	*ibus_input_context_get_engine (IBusInputContext *context);		*ibus_input_context_get_engine (IBusInputContext *context);
	/**		/**
	* ibus_input_context_set_engine:		* ibus_input_context_set_engine:
	* @context: An IBusInputContext.		* @context: An IBusInputContext.
	* @name: A name of the engine.		* @name: A name of the engine.
	*		*
	* Invoked when the IME engine is changed.		* Invoked when the IME engine is changed.
	*/		*/
	void ibus_input_context_set_engine (IBusInputContext *context,		void ibus_input_context_set_engine (IBusInputContext *context,
	const gchar *name);		const gchar *name);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	ibuskeymap.h		ibuskeymap.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 83		skipping to change at line 84
	* keymap[.][i]		* keymap[.][i]
	* i:		* i:
	* 0 - without modifer		* 0 - without modifer
	* 1 - shift		* 1 - shift
	* 2 - caplock		* 2 - caplock
	* 3 - shift caplock		* 3 - shift caplock
	* 4 - altgr		* 4 - altgr
	* 5 - shift altgr		* 5 - shift altgr
	* 6 - numlock		* 6 - numlock
	*/		*/
	typedef guint KEYMAP[256][7];		/* typedef guint KEYMAP[256][7]; */
	/**		/**
	* IBusKeymap:		* IBusKeymap:
	* @name: The name of the keymap, such as 'us', 'jp'.		* @name: The name of the keymap, such as 'us', 'jp'.
	* @keymap: Keymap table. IME developers normally don have to touch this.		* @keymap: Keymap table. IME developers normally don have to touch this.
	*		*
	* A keymap object in IBus.		* A keymap object in IBus.
	*/		*/
	struct _IBusKeymap {		struct _IBusKeymap {
	/*< private >*/		/*< private >*/
	IBusObject parent;		IBusObject parent;
	/* members */		/* members */
	/*< public >*/		/*< public >*/
	gchar *name;		gchar *name;
	KEYMAP keymap;		guint keymap[256][7];
	};		};
	struct _IBusKeymapClass {		struct _IBusKeymapClass {
	IBusObjectClass parent;		IBusObjectClass parent;
	};		};
	GType ibus_keymap_get_type (void);		GType ibus_keymap_get_type (void);
	/**		/**
	* ibus_keymap_new:		* ibus_keymap_new:
End of changes. 3 change blocks.
	2 lines changed or deleted		3 lines changed or added

	ibuskeysyms.h		ibuskeysyms.h
			/* -*- 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-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 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,
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibuslookuptable.h		ibuslookuptable.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 137		skipping to change at line 138
	*		*
	* Return the number of candidate in the table.		* Return the number of candidate in the table.
	*/		*/
	guint ibus_lookup_table_get_number_of_candidates		guint ibus_lookup_table_get_number_of_candidates
	(IBusLookupTable *table) ;		(IBusLookupTable *table) ;
	/**		/**
	* ibus_lookup_table_get_candidate:		* ibus_lookup_table_get_candidate:
	* @table: An IBusLookupTable.		* @table: An IBusLookupTable.
	* @index: Index in the Lookup table.		* @index: Index in the Lookup table.
	* @returns: IBusText at the given index; NULL if no such IBusText.		* @returns: (transfer none): IBusText at the given index; NULL if no such IBusText.
	*		*
	* Return IBusText at the given index. Borrowed reference.		* Return IBusText at the given index. Borrowed reference.
	*/		*/
	IBusText *ibus_lookup_table_get_candidate		IBusText *ibus_lookup_table_get_candidate
	(IBusLookupTable *table,		(IBusLookupTable *table,
	guint index) ;		guint index) ;
	/**		/**
	* ibus_lookup_table_append_label:		* ibus_lookup_table_append_label:
	* @table: An IBusLookupTable.		* @table: An IBusLookupTable.
	skipping to change at line 177		skipping to change at line 178
	*/		*/
	void ibus_lookup_table_set_label		void ibus_lookup_table_set_label
	(IBusLookupTable *table,		(IBusLookupTable *table,
	guint index,		guint index,
	IBusText *text);		IBusText *text);
	/**		/**
	* ibus_lookup_table_get_label:		* ibus_lookup_table_get_label:
	* @table: An IBusLookupTable.		* @table: An IBusLookupTable.
	* @index: Index in the Lookup table.		* @index: Index in the Lookup table.
	* @returns: IBusText at the given index; NULL if no such IBusText.		* @returns: (transfer none): IBusText at the given index; NULL if no such IBusText.
	*		*
	* Return IBusText at the given index. Borrowed reference.		* Return IBusText at the given index. Borrowed reference.
	*/		*/
	IBusText *ibus_lookup_table_get_label		IBusText *ibus_lookup_table_get_label
	(IBusLookupTable *table,		(IBusLookupTable *table,
	guint index) ;		guint index) ;
	/**		/**
	* ibus_lookup_table_set_cursor_pos:		* ibus_lookup_table_set_cursor_pos:
	* @table: An IBusLookupTable.		* @table: An IBusLookupTable.
End of changes. 3 change blocks.
	2 lines changed or deleted		3 lines changed or added

	ibusmainloop.h		ibusmainloop.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 34		skipping to change at line 35
	* @stability: Stable		* @stability: Stable
	*		*
	* This section defines the DBus server and connection setup functions,		* This section defines the DBus server and connection setup functions,
	* and prototypes of their callback functions.		* and prototypes of their callback functions.
	*/		*/
	#ifndef __IBUS_MAINLOOP_H_		#ifndef __IBUS_MAINLOOP_H_
	#define __IBUS_MAINLOOP_H_		#define __IBUS_MAINLOOP_H_
	#include <glib.h>		#include <glib.h>
	#include <dbus/dbus.h>		#include "ibusdbus.h"
	/**		/**
	* DBusConnectionSetupFunc:		* DBusConnectionSetupFunc:
	* @connection: A DBusConnection		* @connection: A DBusConnection
	* @user_data: User data to be passed to callback function.		* @user_data: User data to be passed to callback function.
	*		*
	* A prototype of callback to DBus connection setup function.		* A prototype of callback to DBus connection setup function.
	*/		*/
	typedef void (* DBusConnectionSetupFunc) (DBusConnection *connection,		typedef void (* DBusConnectionSetupFunc) (DBusConnection *connection,
	gpointer user_data);		gpointer user_data);
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	ibusmessage.h		ibusmessage.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 38		skipping to change at line 39
	* be sent to another application.		* be sent to another application.
	*		*
	* Besides DBusMessage functions, An IBusMessage can be manipulated		* Besides DBusMessage functions, An IBusMessage can be manipulated
	* with its own specific functions, which are defined in this section.		* with its own specific functions, which are defined in this section.
	*/		*/
	#ifndef __IBUS_MESSAGE_H_		#ifndef __IBUS_MESSAGE_H_
	#define __IBUS_MESSAGE_H_		#define __IBUS_MESSAGE_H_
	#include <glib.h>		#include <glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus.h>		#include "ibusdbus.h"
	#include "ibuserror.h"		#include "ibuserror.h"
	/**		/**
	* IBUS_TYPE_OBJECT_PATH:		* IBUS_TYPE_OBJECT_PATH:
	*		*
	* Type of object path.		* Type of object path.
	*/		*/
	#define IBUS_TYPE_OBJECT_PATH (ibus_type_get_object_path ())		#define IBUS_TYPE_OBJECT_PATH (ibus_type_get_object_path ())
	/**		/**
	skipping to change at line 79		skipping to change at line 80
	/**		/**
	* IBUS_TYPE_VARIANT:		* IBUS_TYPE_VARIANT:
	*		*
	* Type of IBusVariant.		* Type of IBusVariant.
	*/		*/
	#define IBUS_TYPE_VARIANT (ibus_type_get_variant ())		#define IBUS_TYPE_VARIANT (ibus_type_get_variant ())
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/**		/**
	* IBusMessage:
	*
	* An opaque data structure that represents IBusMessage.
	*/
	typedef DBusMessage IBusMessage;
	/**
	* IBusMessageIter:
	*
	* An opaque data structure that represents IBusMessageIter.
	*/
	typedef DBusMessageIter IBusMessageIter;
	/**
	* ibus_type_get_object_path:		* ibus_type_get_object_path:
	* @returns: Type of object path.		* @returns: Type of object path.
	*		*
	* Gets the type of object path.		* Gets the type of object path.
	*/		*/
	GType ibus_type_get_object_path (void);		GType ibus_type_get_object_path (void);
	/**		/**
	* ibus_type_get_array:		* ibus_type_get_array:
	* @returns: Type of IBusArray.		* @returns: Type of IBusArray.
End of changes. 3 change blocks.
	15 lines changed or deleted		2 lines changed or added

	ibusobject.h		ibusobject.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusobservedpath.h		ibusobservedpath.h
			/* -*- 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-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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 112		skipping to change at line 113
	* @returns: A newly allocated IBusObservedPath.		* @returns: A newly allocated IBusObservedPath.
	*		*
	* 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.
	* @returns: A newly allocate GList which holds content in path; NULL if @p ath is not directory.		* @returns: (element-type IBusObservedPath): A newly allocate 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 newly allocated		* Recursively traverse the path and put the files and subdirectory in to a newly allocated
	* GLists, if the @path is a directory. Otherwise returns NULL.		* 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);
	/**		/**
	* 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. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	ibuspanelservice.h		ibuspanelservice.h
			/* -*- 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, 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 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,
	skipping to change at line 240		skipping to change at line 241
	* @prop_name: A property name		* @prop_name: A property name
	*		*
	* Notify that a property is hidden		* Notify that a property is hidden
	* by sending a "ValueChanged" message to IBus service.		* by sending a "ValueChanged" message to IBus service.
	*/		*/
	void ibus_panel_service_property_hide (IBusPanelService *panel,		void ibus_panel_service_property_hide (IBusPanelService *panel,
	const gchar *prop_name);		const gchar *prop_name);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
	/* For Emacs:
	* Local Variables:
	* c-file-style: "gnu"
	* c-basic-offset: 4
	* End:
	*/
End of changes. 2 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibuspendingcall.h		ibuspendingcall.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 37		skipping to change at line 38
	* An IBusPendingCall is essentially a DBusPendingCall, which representing an expected reply.		* An IBusPendingCall is essentially a DBusPendingCall, which representing an expected reply.
	* A IBusPendingCall can be created when you send a message that should hav e a reply.		* A IBusPendingCall can be created when you send a message that should hav e a reply.
	*		*
	* Besides DBusPendingCall functions, An IBusPendingCall can be manipulated		* Besides DBusPendingCall functions, An IBusPendingCall can be manipulated
	* with its own specific functions, which are defined in this section.		* with its own specific functions, which are defined in this section.
	*/		*/
	#ifndef __IBUS_PENDING_CALL_H_		#ifndef __IBUS_PENDING_CALL_H_
	#define __IBUS_PENDING_CALL_H_		#define __IBUS_PENDING_CALL_H_
	#include <glib.h>		#include <glib.h>
	#include <dbus/dbus.h>		#include "ibusdbus.h"
	#include "ibusmessage.h"		#include "ibusmessage.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/**		/**
	* IBusPendingCall:
	*
	* An opaque data structure that represents IBusPendingCall.
	*/
	typedef DBusPendingCall IBusPendingCall;
	/**
	* IBusPendingCallNotifyFunction:		* IBusPendingCallNotifyFunction:
	* @pending: An IBusPendingCall.		* @pending: An IBusPendingCall.
	* @user_data: User data for the callback function.		* @user_data: User data for the callback function.
	*		*
	* Callback prototype of pending call notify function.		* Callback prototype of pending call notify function.
	*/		*/
	typedef void (* IBusPendingCallNotifyFunction)(IBusPendingCall *pending, gp ointer user_data);		typedef void (* IBusPendingCallNotifyFunction)(IBusPendingCall *pending, gp ointer user_data);
	/**		/**
	* ibus_pending_call_ref:		* ibus_pending_call_ref:
End of changes. 3 change blocks.
	8 lines changed or deleted		2 lines changed or added

	ibusproperty.h		ibusproperty.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusproplist.h		ibusproplist.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 102		skipping to change at line 103
	*		*
	* Append an IBusProperty to an IBusPropList, and increase reference.		* Append an IBusProperty to an IBusPropList, and increase reference.
	*/		*/
	void ibus_prop_list_append (IBusPropList *prop_list,		void ibus_prop_list_append (IBusPropList *prop_list,
	IBusProperty *prop);		IBusProperty *prop);
	/**		/**
	* ibus_prop_list_get:		* ibus_prop_list_get:
	* @prop_list: An IBusPropList.		* @prop_list: An IBusPropList.
	* @index: Index of an IBusPropList.		* @index: Index of an IBusPropList.
	* @returns: IBusProperty at given index, NULL if no such IBusProperty.		* @returns: (transfer none): IBusProperty at given index, NULL if no such IBusProperty.
	*		*
	* Returns IBusProperty at given index. Borrowed reference.		* Returns IBusProperty at given index. Borrowed reference.
	*/		*/
	IBusProperty *ibus_prop_list_get (IBusPropList *prop_list,		IBusProperty *ibus_prop_list_get (IBusPropList *prop_list,
	guint index);		guint index);
	/**		/**
	* ibus_prop_list_update_property:		* ibus_prop_list_update_property:
	* @prop_list: An IBusPropList.		* @prop_list: An IBusPropList.
	* @prop: IBusProperty to be update.		* @prop: IBusProperty to be update.
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	ibusproxy.h		ibusproxy.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 36		skipping to change at line 37
	* 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 usConnection.		* which communicate the corresponding #IBusServices on the other end of IB usConnection.
	* For example, IBus clients (such as editors, web browsers) invoke the pro xy object,		* For example, IBus clients (such as editors, web browsers) invoke the pro xy object,
	* IBusInputContext to communicate with the InputContext service of the ibu s-daemon.		* IBusInputContext to communicate with the InputContext service of the ibu s-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_		#ifndef __IBUS_PROXY_H_
	#define __IBUS_PROXY_H_		#define __IBUS_PROXY_H_
	#include <dbus/dbus.h>
	#include "ibusobject.h"		#include "ibusobject.h"
	#include "ibusconnection.h"		#include "ibusconnection.h"
	#include "ibusmessage.h"		#include "ibusmessage.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
	#define IBUS_TYPE_PROXY \		#define IBUS_TYPE_PROXY \
	skipping to change at line 78		skipping to change at line 78
	*/		*/
	struct _IBusProxy {		struct _IBusProxy {
	IBusObject parent;		IBusObject parent;
	/* instance members */		/* instance members */
	};		};
	struct _IBusProxyClass {		struct _IBusProxyClass {
	IBusObjectClass parent;		IBusObjectClass parent;
	/* class members */		/* class members */
	gboolean (* ibus_signal) (IBusProxy *proxy,		gboolean (* ibus_signal) (IBusProxy *proxy,
	IBusMessage *message);		IBusMessage *message);
	/*< private >*/		/*< private >*/
	/* padding */		/* padding */
	gpointer pdummy[7];		gpointer pdummy[7];
	};		};
	GType ibus_proxy_get_type (void);		GType ibus_proxy_get_type (void);
	/**		/**
	* ibus_proxy_new:		* ibus_proxy_new:
	* @name: The service name of proxy object.		* @name: The service name of proxy object.
	skipping to change at line 146		skipping to change at line 146
	* @pending: Return location of a IBusPendingCall object, or NULL if connec tion is disconnected.		* @pending: Return location of a IBusPendingCall object, or NULL if connec tion is disconnected.
	* @timeout_milliseconds: Time out in milliseconds.		* @timeout_milliseconds: Time out in milliseconds.
	* @error: Returned error is stored here; NULL to ignore error.		* @error: Returned error is stored here; NULL to ignore error.
	* @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.
	*		*
	* Call a method of the corresponding service, and returns an IBusPendingCa ll used to receive a reply to the message.		* Call a method of the corresponding service, and returns an IBusPendingCa ll used to receive a reply to the message.
	* This function calls ibus_connection_send_with_reply() to do the actual s ending.		* This function calls ibus_connection_send_with_reply() to do the actual s ending.
	*		*
	* @see_also: ibus_connection_send_with_reply(),		* @see_also: ibus_connection_send_with_reply(), ibus_proxy_call(),
	* @see_also: ibus_proxy_call(), ibus_proxy_send_with_reply(), ibus_proxy_c		* ibus_proxy_send_with_reply(), ibus_proxy_call_with_reply_and_block().
	all_with_reply_and_block().
	*/		*/
	gboolean ibus_proxy_call_with_reply (IBusProxy *proxy,		gboolean ibus_proxy_call_with_reply (IBusProxy *proxy,
	const gchar *method,		const gchar *method,
	IBusPendingCall **pending,		IBusPendingCall **pending,
	gint timeout_mi lliseconds,		gint timeout_mi lliseconds,
	IBusError **error,		IBusError **error,
	GType first_arg_t ype,		GType first_arg_t ype,
	...);		...);
	/**		/**
	skipping to change at line 172		skipping to change at line 172
	* @error: Returned error is stored here; NULL to ignore error.		* @error: Returned error is stored here; NULL to ignore error.
	* @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: An IBusMessage that is the reply or NULL with an error code if the function fails.		* @returns: An IBusMessage that is the reply or NULL with an error code if the function fails.
	*		*
	* Call a method of the corresponding service and blocks a certain time per iod while waiting for		* Call a method of the corresponding service and blocks a certain time per iod while waiting for
	* an IBusMessage as reply.		* an IBusMessage as reply.
	* If the IBusMessage is not NULL, it calls ibus_connection_send_with_reply _and_block() to do the		* If the IBusMessage is not NULL, it calls ibus_connection_send_with_reply _and_block() to do the
	* actual sending.		* actual sending.
	*		*
	* @see_also: ibus_connection_send_with_reply_and_block(),		* @see_also: ibus_connection_send_with_reply_and_block(), ibus_proxy_call(
	* @see_also: ibus_proxy_call(), ibus_proxy_send_with_reply(), ibus_proxy_c		),
	all_with_reply_and_block().		* ibus_proxy_send_with_reply(), ibus_proxy_call_with_reply_and_block().
	*/		*/
	IBusMessage *ibus_proxy_call_with_reply_and_block		IBusMessage *ibus_proxy_call_with_reply_and_block
	(IBusProxy *proxy,		(IBusProxy *proxy,
	const gchar *method,		const gchar *method,
	gint timeout_mi lliseconds,		gint timeout_mi lliseconds,
	IBusError **error,		IBusError **error,
	GType first_arg_ type,		GType first_arg_ type,
	...);		...);
	/**		/**
	skipping to change at line 195		skipping to change at line 195
	* @proxy: An IBusProxy.		* @proxy: An IBusProxy.
	* @message: The IBusMessage to be sent.		* @message: The IBusMessage to be sent.
	* @pending: Return location of a IBusPendingCall object, or NULL if connec tion is disconnected.		* @pending: Return location of a IBusPendingCall object, or NULL if connec tion is disconnected.
	* @timeout_milliseconds: Time out in milliseconds.		* @timeout_milliseconds: Time out in milliseconds.
	* @returns: TRUE if succeed; FALSE otherwise.		* @returns: TRUE if succeed; FALSE otherwise.
	*		*
	* Send an IBusMessage to the corresponding service and returns		* Send an IBusMessage to the corresponding service and returns
	* an IBusPendingCall used to receive a reply to the message.		* an IBusPendingCall used to receive a reply to the message.
	* This function calls ibus_connection_send_with_reply() to do the actual s ending.		* This function calls ibus_connection_send_with_reply() to do the actual s ending.
	*		*
	* @see_also: ibus_connection_send_with_reply(),		* @see_also: ibus_connection_send_with_reply(), ibus_proxy_send(),
	* @see_also: ibus_proxy_send(), ibus_proxy_call_with_reply(), ibus_proxy_s		* ibus_proxy_call_with_reply(), ibus_proxy_send_with_reply_and_block().
	end_with_reply_and_block().
	*/		*/
	gboolean ibus_proxy_send_with_reply (IBusProxy *proxy,		gboolean ibus_proxy_send_with_reply (IBusProxy *proxy,
	IBusMessage *message,		IBusMessage *message,
	IBusPendingCall **pending,		IBusPendingCall **pending,
	gint timeout_mi lliseconds);		gint timeout_mi lliseconds);
	/**		/**
	* ibus_proxy_send_with_reply_and_block:		* ibus_proxy_send_with_reply_and_block:
	* @proxy: An IBusProxy.		* @proxy: An IBusProxy.
	* @message: The IBusMessage to be sent.		* @message: The IBusMessage to be sent.
	* @returns: An IBusMessage that is the reply or NULL with an error code if the function fails.		* @returns: An IBusMessage that is the reply or NULL with an error code if the function fails.
	*		*
	* Send an IBusMessage to the corresponding service and blocks a certain ti me period while waiting for		* Send an IBusMessage to the corresponding service and blocks a certain ti me period while waiting for
	* an IBusMessage as reply.		* an IBusMessage as reply.
	* If the IBusMessage is not NULL, it calls ibus_connection_send_with_reply _and_block() to do the		* If the IBusMessage is not NULL, it calls ibus_connection_send_with_reply _and_block() to do the
	* actual sending.		* actual sending.
	*		*
	* @see_also: ibus_connection_send_with_reply_and_block(),		* @see_also: ibus_connection_send_with_reply_and_block(), ibus_proxy_send(
	* @see_also: ibus_proxy_send(), ibus_proxy_send_with_reply(), ibus_proxy_c		), ibus_proxy_send_with_reply(),
	all_with_reply_and_block().		* ibus_proxy_call_with_reply_and_block().
	*/		*/
	IBusMessage *ibus_proxy_send_with_reply_and_block		IBusMessage *ibus_proxy_send_with_reply_and_block
	(IBusProxy *proxy,		(IBusProxy *proxy,
	IBusMessage *message);		IBusMessage *message);
	/**		/**
	* ibus_proxy_handle_signal:		* ibus_proxy_handle_signal:
	* @proxy: An IBusProxy.		* @proxy: An IBusProxy.
	* @message: The IBusMessage to be sent.		* @message: The IBusMessage to be sent.
	* @returns: TRUE if succeed; FALSE otherwise.		* @returns: TRUE if succeed; FALSE otherwise.
	skipping to change at line 280		skipping to change at line 280
	* @proxy: An IBusProxy.		* @proxy: An IBusProxy.
	* @returns: The service name of the proxy object.		* @returns: The service name of the proxy object.
	*		*
	* Get interface of a proxy object.		* Get interface of a proxy object.
	*/		*/
	const gchar *ibus_proxy_get_interface (IBusProxy *proxy);		const gchar *ibus_proxy_get_interface (IBusProxy *proxy);
	/**		/**
	* ibus_proxy_get_connection:		* ibus_proxy_get_connection:
	* @proxy: An IBusProxy.		* @proxy: An IBusProxy.
	* @returns: The connection of the proxy object.		* @returns: (transfer none): The connection of the proxy object.
	*		*
	* Get the connection of a proxy object.		* Get the connection of a proxy object.
	*/		*/
	IBusConnection *ibus_proxy_get_connection (IBusProxy *proxy);		IBusConnection *ibus_proxy_get_connection (IBusProxy *proxy);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 8 change blocks.
	16 lines changed or deleted		14 lines changed or added

	ibusserializable.h		ibusserializable.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusserver.h		ibusserver.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 32		skipping to change at line 33
	* SECTION: ibusserver		* SECTION: ibusserver
	* @short_description: Server that listen on a socket and wait for connecti on requests.		* @short_description: Server that listen on a socket and wait for connecti on requests.
	* @stability: Stable		* @stability: Stable
	*		*
	* An IBusServer listen on a socket and wait for connections requests,		* An IBusServer listen on a socket and wait for connections requests,
	* just like DBusServer.		* just like DBusServer.
	*/		*/
	#ifndef __IBUS_SERVER_H_		#ifndef __IBUS_SERVER_H_
	#define __IBUS_SERVER_H_		#define __IBUS_SERVER_H_
	#include <dbus/dbus.h>
	#include "ibusobject.h"		#include "ibusobject.h"
	#include "ibusconnection.h"		#include "ibusconnection.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
	#define IBUS_TYPE_SERVER \		#define IBUS_TYPE_SERVER \
	(ibus_server_get_type ())		(ibus_server_get_type ())
	skipping to change at line 58		skipping to change at line 58
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_SERVER))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_SERVER))
	#define IBUS_IS_SERVER_CLASS(klass) \		#define IBUS_IS_SERVER_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_SERVER))		(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_SERVER))
	#define IBUS_SERVER_GET_CLASS(obj) \		#define IBUS_SERVER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_SERVER, IBusServerClass))		(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_SERVER, IBusServerClass))
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _IBusServer IBusServer;		typedef struct _IBusServer IBusServer;
	typedef struct _IBusServerClass IBusServerClass;		typedef struct _IBusServerClass IBusServerClass;
	/**		/**
	* IBusNewConnectionFunc:		* IBusNewConnectionFunc:
	* @server: An IBusServer.		* @server: An IBusServer.
	* @connection: The corresponding IBusConnection.		* @connection: The corresponding IBusConnection.
	*		*
	* Prototype of new connection callback function.		* Prototype of new connection callback function.
	*		*
	* This callback should be connected to signal ::new-connection		* This callback should be connected to signal ::new-connection
	* to handle the event that a new connection is coming in.		* to handle the event that a new connection is coming in.
	* In this handler, IBus could add a reference and continue processing the connection.		* In this handler, IBus could add a reference and continue processing the connection.
End of changes. 3 change blocks.
	2 lines changed or deleted		1 lines changed or added

	ibusservice.h		ibusservice.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 32		skipping to change at line 33
	* 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_		#ifndef __IBUS_SERVICE_H_
	#define __IBUS_SERVICE_H_		#define __IBUS_SERVICE_H_
	#include <dbus/dbus.h>
	#include "ibusobject.h"		#include "ibusobject.h"
	#include "ibusconnection.h"		#include "ibusconnection.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 158		skipping to change at line 158
	*		*
	* Add an IBus Service to an IBusConnection.		* Add an IBus Service to an IBusConnection.
	* This function also connects the service to the signal IBusConnection::de stroy of the connection.		* This function also connects the service to the signal IBusConnection::de stroy of the connection.
	*/		*/
	gboolean ibus_service_add_to_connection (IBusService *service,		gboolean ibus_service_add_to_connection (IBusService *service,
	IBusConnection *connection );		IBusConnection *connection );
	/**		/**
	* ibus_service_get_connections:		* ibus_service_get_connections:
	* @service: An IBusService.		* @service: An IBusService.
	* @returns: A newly allocated list of connections.		* @returns: (transfer container) (element-type IBusConnection): A newly al located list of connections.
	*		*
	* Returns a copy of list of connections.		* Returns a copy of list of connections, but the caller does not own the e
	* List elements need to be unref by g_object_unref().		lement.
	*/		*/
	GList *ibus_service_get_connections (IBusService *service);		GList *ibus_service_get_connections (IBusService *service);
	/**		/**
	* ibus_service_remove_from_connection:		* ibus_service_remove_from_connection:
	* @service: An IBusService.		* @service: An IBusService.
	* @connection: Corresponding IBusCOnnection		* @connection: Corresponding IBusCOnnection
	* @returns: TRUE if succeed; FALSE otherwise.		* @returns: TRUE if succeed; FALSE otherwise.
	*		*
	* Remove an IBusService from an IBusConnection.		* Remove an IBusService from an IBusConnection.
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	ibusshare.h		ibusshare.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
	skipping to change at line 324		skipping to change at line 325
	/**		/**
	* ibus_quit:		* ibus_quit:
	*		*
	* Stops an IBus from running.		* Stops an IBus from running.
	*		*
	* Any calls to ibus_quit() for the loop will return.		* Any calls to ibus_quit() for the loop will return.
	* @see_also: ibus_main().		* @see_also: ibus_main().
	*/		*/
	void ibus_quit (void);		void ibus_quit (void);
			/**
			* ibus_set_log_handler:
			* @verbose: TRUE for verbose logging.
			*
			* Sets GLIB's log handler to ours. Our log handler adds time info
			* including hour, minute, second, and microsecond, like:
			*
			* (ibus-daemon:7088): IBUS-DEBUG: 18:06:45.822819: ibus-daemon started
			*
			* If @verbose is TRUE, all levels of messages will be logged. Otherwise,
			* DEBUG and WARNING messages will be ignored. The function is used in
			* ibus-daemon, but can be useful for IBus client programs as well for
			* debugging. It's totally fine for not calling this function. If you
			* don't set a custom GLIB log handler, the default GLIB log handler will
			* be used.
			*/
			void ibus_set_log_handler (gboolean verbose);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		19 lines changed or added

	ibustext.h		ibustext.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibustypes.h		ibustypes.h
			/* -*- 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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusversion.h		ibusversion.h
	skipping to change at line 52		skipping to change at line 52
	*		*
	* IBus minor version.		* IBus minor version.
	*/		*/
	#define IBUS_MINOR_VERSION (3)		#define IBUS_MINOR_VERSION (3)
	/**		/**
	* IBUS_MICRO_VERSION:		* IBUS_MICRO_VERSION:
	*		*
	* IBus micro version.		* IBus micro version.
	*/		*/
	#define IBUS_MICRO_VERSION (4)		#define IBUS_MICRO_VERSION (8)
	/**		/**
	* 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. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ibusxml.h		ibusxml.h
			/* -*- 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-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 of the License, or (at your option) any later version.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		1 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/