ibus.h		ibus.h
	skipping to change at line 29		skipping to change at line 29
	* Boston, MA 02111-1307, USA.		* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __IBUS_H_		#ifndef __IBUS_H_
	#define __IBUS_H_		#define __IBUS_H_
	#include <ibusversion.h>		#include <ibusversion.h>
	#include <ibusmainloop.h>		#include <ibusmainloop.h>
	#include <ibusshare.h>		#include <ibusshare.h>
	#include <ibusobject.h>		#include <ibusobject.h>
	#include <ibusserializable.h>		#include <ibusserializable.h>
			#include <ibusattribute.h>
			#include <ibusattrlist.h>
	#include <ibustext.h>		#include <ibustext.h>
	#include <ibusconnection.h>		#include <ibusconnection.h>
	#include <ibusserver.h>		#include <ibusserver.h>
	#include <ibusproxy.h>		#include <ibusproxy.h>
	#include <ibusservice.h>		#include <ibusservice.h>
	#include <ibusfactory.h>		#include <ibusfactory.h>
	#include <ibusengine.h>		#include <ibusengine.h>
	#include <ibusattribute.h>
	#include <ibusproperty.h>		#include <ibusproperty.h>
			#include <ibusproplist.h>
	#include <ibuslookuptable.h>		#include <ibuslookuptable.h>
	#include <ibusbus.h>		#include <ibusbus.h>
	#include <ibuskeysyms.h>		#include <ibuskeysyms.h>
	#include <ibuskeymap.h>		#include <ibuskeymap.h>
	#include <ibusmessage.h>		#include <ibusmessage.h>
	#include <ibuspendingcall.h>		#include <ibuspendingcall.h>
	#include <ibuserror.h>		#include <ibuserror.h>
	#include <ibusenumtypes.h>		#include <ibusenumtypes.h>
	#include <ibushotkey.h>		#include <ibushotkey.h>
	#include <ibusxml.h>		#include <ibusxml.h>
End of changes. 3 change blocks.
	1 lines changed or deleted		3 lines changed or added

	ibusattribute.h		ibusattribute.h
	skipping to change at line 34		skipping to change at line 34
	* @see_also: #IBusText		* @see_also: #IBusText
	* @stability: Stable		* @stability: Stable
	*		*
	* An IBusAttribute represents an attribute that associate to IBusText.		* An IBusAttribute represents an attribute that associate to IBusText.
	* It decorates preedit buffer and auxiliary text with underline, foregroun d and background colors.		* It decorates preedit buffer and auxiliary text with underline, foregroun d and background colors.
	*/		*/
	#ifndef __IBUS_ATTRIBUTE_H_		#ifndef __IBUS_ATTRIBUTE_H_
	#define __IBUS_ATTRIBUTE_H_		#define __IBUS_ATTRIBUTE_H_
	#include "ibusserializable.h"		#include "ibusserializable.h"
			G_BEGIN_DECLS
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define IBusAttribute macros */		/* define IBusAttribute macros */
	#define IBUS_TYPE_ATTRIBUTE \		#define IBUS_TYPE_ATTRIBUTE \
	(ibus_attribute_get_type ())		(ibus_attribute_get_type ())
	#define IBUS_ATTRIBUTE(obj) \		#define IBUS_ATTRIBUTE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_ATTRIBUTE, IBusAttribute) )		(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_ATTRIBUTE, IBusAttribute) )
	#define IBUS_ATTRIBUTE_CLASS(klass) \		#define IBUS_ATTRIBUTE_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_ATTRIBUTE, IBusAttributeCl ass))		(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_ATTRIBUTE, IBusAttributeCl ass))
	#define IBUS_IS_ATTRIBUTE(obj) \		#define IBUS_IS_ATTRIBUTE(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_ATTRIBUTE))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_ATTRIBUTE))
	#define IBUS_IS_ATTRIBUTE_CLASS(klass) \		#define IBUS_IS_ATTRIBUTE_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_ATTRIBUTE))		(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_ATTRIBUTE))
	#define IBUS_ATTRIBUTE_GET_CLASS(obj) \		#define IBUS_ATTRIBUTE_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_ATTRIBUTE, IBusAttributeCl ass))		(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_ATTRIBUTE, IBusAttributeCl ass))
	/* define IBusAttrList macros */
	/**
	* IBUS_TYPE_ATTR_LIST:
	*
	* Return GType of IBus attribute list.
	*/
	#define IBUS_TYPE_ATTR_LIST \
	(ibus_attr_list_get_type ())
	/**
	* IBUS_ATTR_LIST:
	* @obj: An object which is subject to casting.
	*
	* Casts an IBUS_ATTR_LIST or derived pointer into a (IBusAttrList*) pointe
	r.
	* Depending on the current debugging level, this function may invoke
	* certain runtime checks to identify invalid casts.
	*/
	#define IBUS_ATTR_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_ATTR_LIST, IBusAttrList))
	/**
	* IBUS_ATTR_LIST_CLASS:
	* @klass: A class to be casted.
	*
	* Casts a derived IBusAttrListClass structure into a IBusAttrListClass str
	ucture.
	*/
	#define IBUS_ATTR_LIST_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_ATTR_LIST, IBusAttrListCla
	ss))
	/**
	* IBUS_IS_ATTR_LIST:
	* @obj: Instance to check for being a IBUS_ATTR_LIST.
	*
	* Checks whether a valid GTypeInstance pointer is of type IBUS_ATTR_LIST.
	*/
	#define IBUS_IS_ATTR_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_ATTR_LIST))
	/**
	* IBUS_IS_ATTR_LIST_CLASS:
	* @klass: A class to be checked.
	*
	* Checks whether class "is a" valid IBusAttrListClass structure of type IB
	US_ATTR_LIST or derived.
	*/
	#define IBUS_IS_ATTR_LIST_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_ATTR_LIST))
	/**
	* IBUS_ATTR_LIST_GET_CLASS:
	* @obj: An object.
	*
	* Get the class of a given object and cast the class to IBusAttrListClass.
	*/
	#define IBUS_ATTR_LIST_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_ATTR_LIST, IBusAttrListCla
	ss))
	/**		/**
	* IBusAttrType:		* IBusAttrType:
	* @IBUS_ATTR_TYPE_UNDERLINE: Decorate with underline.		* @IBUS_ATTR_TYPE_UNDERLINE: Decorate with underline.
	* @IBUS_ATTR_TYPE_FOREGROUND: Foreground color.		* @IBUS_ATTR_TYPE_FOREGROUND: Foreground color.
	* @IBUS_ATTR_TYPE_BACKGROUND: Background color.		* @IBUS_ATTR_TYPE_BACKGROUND: Background color.
	*		*
	* Type enumeration of IBusText attribute.		* Type enumeration of IBusText attribute.
	*/		*/
	typedef enum {		typedef enum {
	IBUS_ATTR_TYPE_UNDERLINE = 1,		IBUS_ATTR_TYPE_UNDERLINE = 1,
	skipping to change at line 139		skipping to change at line 86
	* Type of IBusText attribute.		* Type of IBusText attribute.
	*/		*/
	typedef enum {		typedef enum {
	IBUS_ATTR_UNDERLINE_NONE = 0,		IBUS_ATTR_UNDERLINE_NONE = 0,
	IBUS_ATTR_UNDERLINE_SINGLE = 1,		IBUS_ATTR_UNDERLINE_SINGLE = 1,
	IBUS_ATTR_UNDERLINE_DOUBLE = 2,		IBUS_ATTR_UNDERLINE_DOUBLE = 2,
	IBUS_ATTR_UNDERLINE_LOW = 3,		IBUS_ATTR_UNDERLINE_LOW = 3,
	IBUS_ATTR_UNDERLINE_ERROR = 4,		IBUS_ATTR_UNDERLINE_ERROR = 4,
	} IBusAttrUnderline;		} IBusAttrUnderline;
	G_BEGIN_DECLS
	typedef struct _IBusAttribute IBusAttribute;		typedef struct _IBusAttribute IBusAttribute;
	typedef struct _IBusAttributeClass IBusAttributeClass;		typedef struct _IBusAttributeClass IBusAttributeClass;
	typedef struct _IBusAttrList IBusAttrList;
	typedef struct _IBusAttrListClass IBusAttrListClass;
	/**		/**
	* IBusAttribute:		* IBusAttribute:
	* @type: IBusAttributeType		* @type: IBusAttributeType
	* @value: Value for the type.		* @value: Value for the type.
	* @start_index: The starting index, inclusive.		* @start_index: The starting index, inclusive.
	* @end_index: The ending index, exclusive.		* @end_index: The ending index, exclusive.
	*		*
	* Signify the type, value and scope of the attribute.		* Signify the type, value and scope of the attribute.
	* The scope starts from @start_index till the @end_index-1.		* The scope starts from @start_index till the @end_index-1.
	skipping to change at line 171		skipping to change at line 114
	guint value;		guint value;
	guint start_index;		guint start_index;
	guint end_index;		guint end_index;
	};		};
	struct _IBusAttributeClass {		struct _IBusAttributeClass {
	IBusSerializableClass parent;		IBusSerializableClass parent;
	};		};
	/**		/**
	* IBusAttrList:
	* @attributes: GArray that holds #IBusAttribute.
	*
	* Array of IBusAttribute.
	*/
	struct _IBusAttrList {
	IBusSerializable parent;
	/*< public >*/
	GArray *attributes;
	};
	struct _IBusAttrListClass {
	IBusSerializableClass parent;
	};
	/**
	* ibus_attribute_get_type:		* ibus_attribute_get_type:
	* @returns: GType of IBusAttribute.		* @returns: GType of IBusAttribute.
	*		*
	* Returns GType of IBusAttribute.		* Returns GType of IBusAttribute.
	*/		*/
	GType ibus_attribute_get_type ();		GType ibus_attribute_get_type ();
	/**		/**
	* ibus_attribute_new:		* ibus_attribute_new:
	* @type: Type of the attribute.		* @type: Type of the attribute.
	skipping to change at line 246		skipping to change at line 172
	* @start_index: Where attribute starts.		* @start_index: Where attribute starts.
	* @end_index: Where attribute ends.		* @end_index: Where attribute ends.
	* @returns: A newly allocated IBusAttribute.		* @returns: A newly allocated IBusAttribute.
	*		*
	* New an background IBusAttribute.		* New an background IBusAttribute.
	*/		*/
	IBusAttribute *ibus_attr_background_new (guint color,		IBusAttribute *ibus_attr_background_new (guint color,
	guint start_inde x,		guint start_inde x,
	guint end_index) ;		guint end_index) ;
	/**
	* ibus_attr_list_get_type:
	* @returns: GType of IBusAttrList.
	*
	* Returns GType of IBusAttrList.
	*/
	GType ibus_attr_list_get_type ();
	/**
	* ibus_attr_list_new:
	* @returns: A newly allocated IBusAttrList.
	*
	* New an IBusAttrList.
	*/
	IBusAttrList *ibus_attr_list_new ();
	/**
	* ibus_attr_list_append:
	* @attr_list: An IBusAttrList instance.
	* @attr: The IBusAttribute instance to be appended.
	*
	* Append an IBusAttribute to IBusAttrList, and increase reference.
	*/
	void ibus_attr_list_append (IBusAttrList *attr_list,
	IBusAttribute *attr);
	/**
	* ibus_attr_list_get:
	* @attr_list: An IBusAttrList instance.
	* @index: Index of the @attr_list.
	* @returns: IBusAttribute at given index, NULL if no such IBusAttribute.
	*
	* Returns IBusAttribute at given index. Borrowed reference.
	*/
	IBusAttribute *ibus_attr_list_get (IBusAttrList *attr_list,
	guint index);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 6 change blocks.
	118 lines changed or deleted		3 lines changed or added

	ibusbus.h		ibusbus.h
	skipping to change at line 101		skipping to change at line 101
	/**		/**
	* ibus_bus_get_connection:		* ibus_bus_get_connection:
	* @bus: An IBusBus.		* @bus: An IBusBus.
	* @returns: TRUE if @bus is connected, FALSE otherwise.		* @returns: TRUE if @bus is connected, FALSE otherwise.
	*		*
	* Return IBusConnection of an IBusIBus instance.		* Return IBusConnection of an IBusIBus instance.
	*/		*/
	IBusConnection		IBusConnection
	*ibus_bus_get_connection (IBusBus *bus);		*ibus_bus_get_connection (IBusBus *bus);
	/* declare dbus methods */
			/**
			* ibus_bus_hello:
			* @bus: An IBusBus.
			* @returns: The unique name of IBus process in DBus.
			*
			* This function sends a "HELLO" message to DBus daemon,
			* which replies the unique name of current IBus process.
			*/
	const gchar *ibus_bus_hello (IBusBus *bus);		const gchar *ibus_bus_hello (IBusBus *bus);
	/**		/**
	* ibus_bus_request_name:		* ibus_bus_request_name:
	* @bus: the IBusBus instance to be processed.		* @bus: the IBusBus instance to be processed.
	* @name: Name to be requested.		* @name: Name to be requested.
	* @flags: Flags (FixMe).		* @flags: Flags (FixMe).
	* @returns: 0 if failed; positive number otherwise.		* @returns: 0 if failed; positive number otherwise.
	*		*
	* Request a name from IBus daemon.		* Request a name from IBus daemon.
End of changes. 1 change blocks.
	1 lines changed or deleted		9 lines changed or added

	ibuscomponent.h		ibuscomponent.h
	skipping to change at line 105		skipping to change at line 105
	gchar *textdomain;		gchar *textdomain;
	/*< private >*/		/*< private >*/
	/* engines */		/* engines */
	GList *engines;		GList *engines;
	/* observed paths */		/* observed paths */
	GList *observed_paths;		GList *observed_paths;
	GPid pid;		GPid pid;
	guint child_source_id;
	/* padding */
	gpointer pdummy[5]; // We can add 5 pointers without breaking the ABI.
	};		};
	struct _IBusComponentClass {		struct _IBusComponentClass {
	IBusSerializableClass parent;		IBusSerializableClass parent;
	/* class members */		/* class members */
	};		};
	GType ibus_component_get_type (void);		GType ibus_component_get_type (void);
End of changes. 1 change blocks.
	4 lines changed or deleted		0 lines changed or added

	ibusengine.h		ibusengine.h
	skipping to change at line 37		skipping to change at line 37
	* 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.
	*/		*/
	#ifndef __IBUS_ENGINE_H_		#ifndef __IBUS_ENGINE_H_
	#define __IBUS_ENGINE_H_		#define __IBUS_ENGINE_H_
	#include <dbus/dbus.h>		#include <dbus/dbus.h>
	#include "ibusservice.h"		#include "ibusservice.h"
	#include "ibusattribute.h"		#include "ibusattribute.h"
	#include "ibuslookuptable.h"		#include "ibuslookuptable.h"
	#include "ibusproperty.h"		#include "ibusproplist.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
	#define IBUS_TYPE_ENGINE \		#define IBUS_TYPE_ENGINE \
	(ibus_engine_get_type ())		(ibus_engine_get_type ())
	#define IBUS_ENGINE(obj) \		#define IBUS_ENGINE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_ENGINE, IBusEngine))		(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_ENGINE, IBusEngine))
	skipping to change at line 152		skipping to change at line 152
	IBusEngine *ibus_engine_new (const gchar *name,		IBusEngine *ibus_engine_new (const gchar *name,
	const gchar *path,		const gchar *path,
	IBusConnection *connection);		IBusConnection *connection);
	/**		/**
	* ibus_engine_commit_text:		* ibus_engine_commit_text:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @text: String commit to IBusEngine.		* @text: String commit to IBusEngine.
	*		*
	* Commit output of input method to IBus client.		* Commit output of input method to IBus client.
			*
			* (Note: The text object will be released, if it is floating.
			* If caller want to keep the object, caller should make the object
			* sink by g_object_ref_sink.)
	*/		*/
	void ibus_engine_commit_text (IBusEngine *engine,		void ibus_engine_commit_text (IBusEngine *engine,
	IBusText *text);		IBusText *text);
	/**		/**
	* ibus_engine_update_preedit_text:		* ibus_engine_update_preedit_text:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @text: Update content.		* @text: Update content.
	* @cursor_pos: Current position of cursor		* @cursor_pos: Current position of cursor
	* @visible: Whether the pre-edit buffer is visible.		* @visible: Whether the pre-edit buffer is visible.
	*		*
	* Update the pre-edit buffer.		* Update the pre-edit buffer.
			*
			* (Note: The text object will be released, if it is floating.
			* If caller want to keep the object, caller should make the object
			* sink by g_object_ref_sink.)
	*/		*/
	void ibus_engine_update_preedit_text		void ibus_engine_update_preedit_text
	(IBusEngine *engine,		(IBusEngine *engine,
	IBusText *text,		IBusText *text,
	guint cursor_pos,		guint cursor_pos,
	gboolean visible);		gboolean visible);
	/**		/**
	* ibus_engine_show_preedit_text:		* ibus_engine_show_preedit_text:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	skipping to change at line 196		skipping to change at line 204
	void ibus_engine_hide_preedit_text		void ibus_engine_hide_preedit_text
	(IBusEngine *engine);		(IBusEngine *engine);
	/**		/**
	* ibus_engine_update_auxiliary_text:		* ibus_engine_update_auxiliary_text:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @text: Update content.		* @text: Update content.
	* @visible: Whether the auxiliary text bar is visible.		* @visible: Whether the auxiliary text bar is visible.
	*		*
	* Update the auxiliary bar.		* Update the auxiliary bar.
			*
			* (Note: The text object will be released, if it is floating.
			* If caller want to keep the object, caller should make the object
			* sink by g_object_ref_sink.)
	*/		*/
	void ibus_engine_update_auxiliary_text		void ibus_engine_update_auxiliary_text
	(IBusEngine *engine,		(IBusEngine *engine,
	IBusText *text,		IBusText *text,
	gboolean visible);		gboolean visible);
	/**		/**
	* ibus_engine_show_auxiliary_text:		* ibus_engine_show_auxiliary_text:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	*		*
	skipping to change at line 227		skipping to change at line 239
	void ibus_engine_hide_auxiliary_text		void ibus_engine_hide_auxiliary_text
	(IBusEngine *engine);		(IBusEngine *engine);
	/**		/**
	* ibus_engine_update_lookup_table:		* ibus_engine_update_lookup_table:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @lookup_table: An lookup_table.		* @lookup_table: An lookup_table.
	* @visible: Whether the lookup_table is visible.		* @visible: Whether the lookup_table is visible.
	*		*
	* Update the lookup table.		* Update the lookup table.
			*
			* (Note: The table object will be released, if it is floating.
			* If caller want to keep the object, caller should make the object
			* sink by g_object_ref_sink.)
	*/		*/
	void ibus_engine_update_lookup_table		void ibus_engine_update_lookup_table
	(IBusEngine *engine,		(IBusEngine *engine,
	IBusLookupTable *lookup_table,		IBusLookupTable *lookup_table,
	gboolean visible);		gboolean visible);
	/**		/**
	* ibus_engine_update_lookup_table_fast:		* ibus_engine_update_lookup_table_fast:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @lookup_table: An lookup_table.		* @lookup_table: An lookup_table.
	* @visible: Whether the lookup_table is visible.		* @visible: Whether the lookup_table is visible.
	*		*
	* Fast update for big lookup table.		* Fast update for big lookup table.
	*		*
	* If size of lookup table is not over table page size *4,		* If size of lookup table is not over table page size *4,
	* then it calls ibus_engine_update_lookup_table().		* then it calls ibus_engine_update_lookup_table().
	*		*
			* (Note: The table object will be released, if it is floating.
			* If caller want to keep the object, caller should make the object
			* sink by g_object_ref_sink.)
	*/		*/
	void ibus_engine_update_lookup_table_fast		void ibus_engine_update_lookup_table_fast
	(IBusEngine *engine,		(IBusEngine *engine,
	IBusLookupTable *lookup_table,		IBusLookupTable *lookup_table,
	gboolean visible);		gboolean visible);
	/**		/**
	* ibus_engine_show_lookup_table:		* ibus_engine_show_lookup_table:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	*		*
	skipping to change at line 289		skipping to change at line 308
	guint keyval,		guint keyval,
	guint keycode,		guint keycode,
	guint state);		guint state);
	/**		/**
	* ibus_engine_register_properties:		* ibus_engine_register_properties:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @prop_list: Property List.		* @prop_list: Property List.
	*		*
	* Register and show properties in language bar.		* Register and show properties in language bar.
			*
			* (Note: The prop_list object will be released, if it is floating.
			* If caller want to keep the object, caller should make the object
			* sink by g_object_ref_sink.)
	*/		*/
	void ibus_engine_register_properties		void ibus_engine_register_properties
	(IBusEngine *engine,		(IBusEngine *engine,
	IBusPropList *prop_list);		IBusPropList *prop_list);
	/**		/**
	* ibus_engine_update_property:		* ibus_engine_update_property:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @prop: IBusProperty to be updated.		* @prop: IBusProperty to be updated.
	*		*
	* Update the state displayed in language bar.		* Update the state displayed in language bar.
			*
			* (Note: The prop object will be released, if it is floating.
			* If caller want to keep the object, caller should make the object
			* sink by g_object_ref_sink.)
	*/		*/
	void ibus_engine_update_property(IBusEngine *engine,		void ibus_engine_update_property(IBusEngine *engine,
	IBusProperty *prop);		IBusProperty *prop);
	/**		/**
	* ibus_engine_delete_surrounding_text:		* ibus_engine_delete_surrounding_text:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @offset: The offset of the first char.		* @offset: The offset of the first char.
	* @nchars: Number of chars to be deleted.		* @nchars: Number of chars to be deleted.
	*		*
End of changes. 8 change blocks.
	1 lines changed or deleted		28 lines changed or added

	ibusfactory.h		ibusfactory.h
	skipping to change at line 38		skipping to change at line 38
	* 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.
	*/		*/
	#ifndef __IBUS_FACTORY_H_		#ifndef __IBUS_FACTORY_H_
	#define __IBUS_FACTORY_H_		#define __IBUS_FACTORY_H_
	#include <dbus/dbus.h>		#include <dbus/dbus.h>
	#include "ibusservice.h"		#include "ibusservice.h"
	#include "ibusserializable.h"		#include "ibusserializable.h"
			G_BEGIN_DECLS
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
	#define IBUS_TYPE_FACTORY \
	(ibus_factory_get_type ())
	#define IBUS_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_FACTORY, IBusFactory))
	#define IBUS_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_FACTORY, IBusFactoryClass)
	)
	#define IBUS_IS_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_FACTORY))
	#define IBUS_IS_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_FACTORY))
	#define IBUS_FACTORY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_FACTORY, IBusFactoryClass)
	)
	/**		/**
	* IBUS_TYPE_FACTORY_INFO:		* IBUS_TYPE_FACTORY:
	*		*
	* Return GType of IBus factory information.		* Return GType of IBus factory.
	*/		*/
	#define IBUS_TYPE_FACTORY_INFO \		#define IBUS_TYPE_FACTORY \
	(ibus_factory_info_get_type ())		(ibus_factory_get_type ())
	/**		/**
	* IBUS_FACTORY_INFO:		* IBUS_FACTORY:
	* @obj: An object which is subject to casting.		* @obj: An object which is subject to casting.
	*		*
	* Casts an IBUS_FACTORY_INFO or derived pointer into a (IBusFactoryInfo*) pointer.		* Casts an IBUS_FACTORY or derived pointer into a (IBusFactory*) pointer.
	* Depending on the current debugging level, this function may invoke		* Depending on the current debugging level, this function may invoke
	* certain runtime checks to identify invalid casts.		* certain runtime checks to identify invalid casts.
	*/		*/
	#define IBUS_FACTORY_INFO(obj) \		#define IBUS_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_FACTORY_INFO, IBusFactory		(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_FACTORY, IBusFactory))
	Info))
	/**		/**
	* IBUS_FACTORY_INFO_CLASS:		* IBUS_FACTORY_CLASS:
	* @klass: A class to be casted.		* @klass: A class to be casted.
	*		*
	* Casts a derived IBusFactoryInfoClass structure into a IBusFactoryInfoCla ss structure.		* Casts a derived IBusFactoryClass structure into a IBusFactoryClass struc ture.
	*/		*/
	#define IBUS_FACTORY_INFO_CLASS(klass) \		#define IBUS_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_FACTORY_INFO, IBusFactoryI		(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_FACTORY, IBusFactoryClass)
	nfoClass))		)
	/**		/**
	* IBUS_IS_FACTORY_INFO:		* IBUS_IS_FACTORY:
	* @obj: Instance to check for being a IBUS_FACTORY_INFO.		* @obj: Instance to check for being a IBUS_FACTORY.
	*		*
	* Checks whether a valid GTypeInstance pointer is of type IBUS_FACTORY_INF O.		* Checks whether a valid GTypeInstance pointer is of type IBUS_FACTORY.
	*/		*/
	#define IBUS_IS_FACTORY_INFO(obj) \		#define IBUS_IS_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_FACTORY_INFO))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_FACTORY))
	/**		/**
	* IBUS_IS_FACTORY_INFO_CLASS:		* IBUS_IS_FACTORY_CLASS:
	* @klass: A class to be checked.		* @klass: A class to be checked.
	*		*
	* Checks whether class "is a" valid IBusFactoryInfoClass structure of type IBUS_FACTORY_INFO or derived.		* Checks whether class "is a" valid IBusFactoryClass structure of type IBU S_FACTORY or derived.
	*/		*/
	#define IBUS_IS_FACTORY_INFO_CLASS(klass) \		#define IBUS_IS_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_FACTORY_INFO))		(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_FACTORY))
	/**		/**
	* IBUS_FACTORY_INFO_GET_CLASS:		* IBUS_FACTORY_GET_CLASS:
	* @obj: An object.		* @obj: An object.
	*		*
	* Get the class of a given object and cast the class to IBusFactoryInfoCla ss.		* Get the class of a given object and cast the class to IBusFactoryClass.
	*/		*/
	#define IBUS_FACTORY_INFO_GET_CLASS(obj) \		#define IBUS_FACTORY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_FACTORY_INFO, IBusFactoryI		(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_FACTORY, IBusFactoryClass)
	nfoClass))		)
	G_BEGIN_DECLS
	typedef struct _IBusFactory IBusFactory;		typedef struct _IBusFactory IBusFactory;
	typedef struct _IBusFactoryClass IBusFactoryClass;		typedef struct _IBusFactoryClass IBusFactoryClass;
	typedef struct _IBusFactoryInfo IBusFactoryInfo;
	typedef struct _IBusFactoryInfoClass IBusFactoryInfoClass;
	/**		/**
	* IBusFactory:		* IBusFactory:
	*		*
	* An opaque data type representing an IBusFactory.		* An opaque data type representing an IBusFactory.
	*/		*/
	struct _IBusFactory {		struct _IBusFactory {
	IBusService parent;		IBusService parent;
	/* instance members */		/* instance members */
	skipping to change at line 140		skipping to change at line 125
	IBusServiceClass parent;		IBusServiceClass parent;
	/* signals */		/* signals */
	/*< private >*/		/*< private >*/
	/* padding */		/* padding */
	gpointer pdummy[8];		gpointer pdummy[8];
	};		};
	/**		/**
	* IBusFactoryInfo:		* ibus_factory_info_get_type:
	* @path: D-Bus path for the IME.		* @returns: GType of IBus factory information.
	* @name: D-Bus name for the IME.
	* @lang: Supporting language of the IME.
	* @icon: Icon file of the IME.
	* @authors: Authors of the IME.
	* @credits: Credits of the IME.
	*		*
	* An IBusFactoryInfo stores information about an IME.		* Return GType of IBus factory information.
	* So CreateEngine method can create instances of that IME.
	*/		*/
	struct _IBusFactoryInfo {
	IBusSerializable parent;
	/* instance members */
	/*< public >*/
	gchar *path;
	gchar *name;
	gchar *lang;
	gchar *icon;
	gchar *authors;
	gchar *credits;
	};
	struct _IBusFactoryInfoClass {
	IBusSerializableClass parent;
	/* signals */
	/*< private >*/
	/* padding */
	gpointer pdummy[8];
	};
	GType ibus_factory_get_type (void);		GType ibus_factory_get_type (void);
	/**		/**
	* ibus_factory_new:		* ibus_factory_new:
	* @connection: An IBusConnection.		* @connection: An IBusConnection.
	* @returns: A newly allocated IBusFactory.		* @returns: A newly allocated IBusFactory.
	*		*
	* New an IBusFactory.		* New an IBusFactory.
	*/		*/
	IBusFactory *ibus_factory_new (IBusConnection *connection );		IBusFactory *ibus_factory_new (IBusConnection *connection );
	skipping to change at line 197		skipping to change at line 153
	* @factory: An IBusFactory.		* @factory: An IBusFactory.
	* @engine_name: Name of an engine.		* @engine_name: Name of an engine.
	* @engine_type: GType of an engine.		* @engine_type: GType of an engine.
	*		*
	* Add an engine to the factory.		* Add an engine to the factory.
	*/		*/
	void ibus_factory_add_engine (IBusFactory *factory,		void ibus_factory_add_engine (IBusFactory *factory,
	const gchar *engine_nam e,		const gchar *engine_nam e,
	GType engine_typ e);		GType engine_typ e);
	/**
	* ibus_factory_get_info:
	* @factory: An IBusFactory.
	* @returns: A corresponding IbusFactoryInfo.
	*
	* Get IBusFactoryInfo out of IBusFactory.
	*
	* <note><para>This function is currently commented out</para></note>
	*/
	IBusFactoryInfo *ibus_factory_get_info (IBusFactory *factory);
	GType ibus_factory_info_get_type (void);
	/**
	* ibus_factory_info_new:
	* @path: D-Bus path for the IME.
	* @name: IME name.
	* @lang: Supporting language of the IME.
	* @icon: Icon file of the IME.
	* @authors: Authors of the IME.
	* @credits: Credits of the IME.
	* @returns: A newly allocated IBusFactoryInfo.
	*
	* New an IBusFactoryInfo.
	*/
	IBusFactoryInfo *ibus_factory_info_new (const gchar *path,
	const gchar *name,
	const gchar *lang,
	const gchar *icon,
	const gchar *authors,
	const gchar *credits);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 25 change blocks.
	110 lines changed or deleted		32 lines changed or added

	ibusinputcontext.h		ibusinputcontext.h
	skipping to change at line 239		skipping to change at line 239
	* ibus_input_context_disable:		* ibus_input_context_disable:
	* @context: An IBusInputContext.		* @context: An IBusInputContext.
	*		*
	* Invoked when the IME is disabled, either by IME switch hotkey or select from the menu.		* Invoked when the IME is disabled, either by IME switch hotkey or select from the menu.
	*		*
	* @see_also: #IBusEngine::disable		* @see_also: #IBusEngine::disable
	*/		*/
	void ibus_input_context_disable (IBusInputContext *context);		void ibus_input_context_disable (IBusInputContext *context);
	/**		/**
	* ibus_input_context_is_ensabled:		* ibus_input_context_is_enabled:
	* @context: An IBusInputContext.		* @context: An IBusInputContext.
	* @returns: TRUE if the IME is enabled on the context.		* @returns: TRUE if the IME is enabled on the context.
	*		*
	* Returns TRUE if the IME is enabled on the context.		* Returns TRUE if the IME is enabled on the context.
	*/		*/
	gboolean ibus_input_context_is_enabled (IBusInputContext *context);		gboolean ibus_input_context_is_enabled (IBusInputContext *context);
	/**		/**
	* ibus_input_context_get_engine:		* ibus_input_context_get_engine:
	* @context: An IBusInputContext.		* @context: An IBusInputContext.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ibuskeymap.h		ibuskeymap.h
	skipping to change at line 108		skipping to change at line 108
	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:
	* @name: The keymap file to be loaded, such as 'us', 'jp'.		* @name: The keymap file to be loaded, such as 'us', 'jp'.
	* @returns: A newly allocated IBusKeymap; or NULL if failed.		* @returns: An IBusKeymap associated with the giving name; or NULL if fail ed.
	*		*
	* New an IBusKeymap.		* Get an IBusKeymap associated with the giving name.
			*
			* This function loads the keymap file specified in @name
			* in the IBUS_DATA_DIR/keymaps directory.
			*
			* Deprecated: This function has been deprecated and should
			* not be used in newly written code. Please use ibus_keymap_get().
			*/
			IBusKeymap *ibus_keymap_new (const gchar *na
			me)
			G_GNUC_DEPRECATED;
			/**
			* ibus_keymap_get:
			* @name: The keymap file to be loaded, such as 'us', 'jp'.
			* @returns: An IBusKeymap associated with the giving name; or NULL if fail
			ed.
			*
			* Get an IBusKeymap associated with the giving name.
	*		*
	* This function loads the keymap file specified in @name		* This function loads the keymap file specified in @name
	* in the IBUS_DATA_DIR/keymaps directory.		* in the IBUS_DATA_DIR/keymaps directory.
	*/		*/
	IBusKeymap *ibus_keymap_new (const gchar *na me);		IBusKeymap *ibus_keymap_get (const gchar *na me);
	/**		/**
	* ibus_keymap_lookup_keysym:		* ibus_keymap_lookup_keysym:
	* @keymap: An IBusKeymap.		* @keymap: An IBusKeymap.
	* @keycode: A scancode to be converted.		* @keycode: A scancode to be converted.
	* @state: Modifier flags(such as Ctrl, Shift).		* @state: Modifier flags(such as Ctrl, Shift).
	* @returns: Corresponding keysym.		* @returns: Corresponding keysym.
	*		*
	* Convert the scancode to keysym, given the keymap.		* Convert the scancode to keysym, given the keymap.
	*/		*/
End of changes. 3 change blocks.
	3 lines changed or deleted		21 lines changed or added

	ibusmessage.h		ibusmessage.h
	skipping to change at line 23		skipping to change at line 23
	* 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 Foundation, Inc., 59 Temple Place - Suite 330,		* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	* Boston, MA 02111-1307, USA.		* Boston, MA 02111-1307, USA.
	*/		*/
	/**		/**
	* SECTION: ibusmessage		* SECTION: ibusmessage
	* @short_description: A DBusMessage in IBus.		* @Title: IBusMessage
	* @stability: Stable		* @Short_description: A DBusMessage in IBus.
			* @Stability: Stable
	*		*
	* An IBusMessage is essentially a DBusMessage, which representing a messag e received from or to		* An IBusMessage is essentially a DBusMessage, which representing a messag e received from or to
	* 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_
End of changes. 1 change blocks.
	2 lines changed or deleted		3 lines changed or added

	ibusobject.h		ibusobject.h
	skipping to change at line 31		skipping to change at line 31
	/**		/**
	* SECTION: ibusobject		* SECTION: ibusobject
	* @short_description: Base object of IBus.		* @short_description: Base object of IBus.
	* @stability: Stable		* @stability: Stable
	*		*
	* IBusObject is the base object for all objects in IBus.		* IBusObject is the base object for all objects in IBus.
	*/		*/
	#ifndef __IBUS_OBJECT_H_		#ifndef __IBUS_OBJECT_H_
	#define __IBUS_OBJECT_H_		#define __IBUS_OBJECT_H_
	/**
	* SECTION: IBusObject
	* @short_description: Base object of IBus.
	*
	*
	* This module provides essential definition and functions for manipulating
	* IBus base object.
	*/
	#include <glib-object.h>		#include <glib-object.h>
	#include "ibusmarshalers.h"		#include "ibusmarshalers.h"
	#include "ibustypes.h"		#include "ibustypes.h"
	#include "ibusdebug.h"		#include "ibusdebug.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
End of changes. 1 change blocks.
	8 lines changed or deleted		0 lines changed or added

	ibuspanelservice.h		ibuspanelservice.h
	skipping to change at line 34		skipping to change at line 34
	*		*
	* An IBusPanelService is a base class for UI services.		* An IBusPanelService is a base class for UI services.
	* Developers can "extend" this class for panel UI development.		* Developers can "extend" this class for panel UI development.
	*/		*/
	#ifndef __IBUS_PANEL_SERVICE_H_		#ifndef __IBUS_PANEL_SERVICE_H_
	#define __IBUS_PANEL_SERVICE_H_		#define __IBUS_PANEL_SERVICE_H_
	#include "ibusconnection.h"		#include "ibusconnection.h"
	#include "ibuslookuptable.h"		#include "ibuslookuptable.h"
	#include "ibusservice.h"		#include "ibusservice.h"
	#include "ibusproperty.h"		#include "ibusproplist.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define GOBJECT macros */		/* define GOBJECT macros */
	#define IBUS_TYPE_PANEL_SERVICE \		#define IBUS_TYPE_PANEL_SERVICE \
	(ibus_panel_service_get_type ())		(ibus_panel_service_get_type ())
	#define IBUS_PANEL_SERVICE(obj) \		#define IBUS_PANEL_SERVICE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_PANEL_SERVICE, IBusPanelS ervice))		(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_PANEL_SERVICE, IBusPanelS ervice))
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ibuspendingcall.h		ibuspendingcall.h
	skipping to change at line 23		skipping to change at line 23
	* 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 Foundation, Inc., 59 Temple Place - Suite 330,		* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	* Boston, MA 02111-1307, USA.		* Boston, MA 02111-1307, USA.
	*/		*/
	/**		/**
	* SECTION: ibuspendingcall		* SECTION: ibuspendingcall
	* @short_description: A DBusPendingCall in IBus.		* @Title: IBusPendingCall
	* @stability: Stable		* @Short_description: A DBusPendingCall in IBus.
			* @Stability: Stable
	*		*
	* 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_
End of changes. 1 change blocks.
	2 lines changed or deleted		3 lines changed or added

	ibusproperty.h		ibusproperty.h
	skipping to change at line 59		skipping to change at line 59
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_PROPERTY, IBusProperty))		(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_PROPERTY, IBusProperty))
	#define IBUS_PROPERTY_CLASS(klass) \		#define IBUS_PROPERTY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_PROPERTY, IBusPropertyClas s))		(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_PROPERTY, IBusPropertyClas s))
	#define IBUS_IS_PROPERTY(obj) \		#define IBUS_IS_PROPERTY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_PROPERTY))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_PROPERTY))
	#define IBUS_IS_PROPERTY_CLASS(klass) \		#define IBUS_IS_PROPERTY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_PROPERTY))		(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_PROPERTY))
	#define IBUS_PROPERTY_GET_CLASS(obj) \		#define IBUS_PROPERTY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_PROPERTY, IBusPropertyClas s))		(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_PROPERTY, IBusPropertyClas s))
	/* define IBusPropList macros */
	/**
	* IBUS_TYPE_PROP_LIST:
	* @returns: IBusPropList GType.
	*
	* Returns GType of IBus property list.
	*/
	#define IBUS_TYPE_PROP_LIST \
	(ibus_prop_list_get_type ())
	/**
	* IBUS_PROP_LIST:
	* @obj: An object which is subject to casting.
	*
	* Casts an IBUS_PROP_LIST or derived pointer into a (IBusPropList*) pointe
	r.
	* Depending on the current debugging level, this function may invoke
	* certain runtime checks to identify invalid casts.
	*/
	#define IBUS_PROP_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_PROP_LIST, IBusPropList))
	/**
	* IBUS_PROP_LIST_CLASS:
	* @klass: A class to be casted.
	*
	* Casts a derived IBusPropListClass structure into a IBusPropListClass str
	ucture.
	*/
	#define IBUS_PROP_LIST_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_PROP_LIST, IBusPropListCla
	ss))
	/**
	* IBUS_IS_PROP_LIST:
	* @obj: Instance to check for being a IBUS_PROP_LIST.
	*
	* Checks whether a valid GTypeInstance pointer is of type IBUS_PROP_LIST.
	*/
	#define IBUS_IS_PROP_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_PROP_LIST))
	/**
	* IBUS_IS_PROP_LIST_CLASS:
	* @klass: A class to be checked.
	*
	* Checks whether class "is a" valid IBusPropListClass structure of type IB
	US_PROP_LIST or derived.
	*/
	#define IBUS_IS_PROP_LIST_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_PROP_LIST))
	/**
	* IBUS_PROP_LIST_GET_CLASS:
	* @obj: An object.
	*
	* Get the class of a given object and cast the class to IBusPropListClass.
	*/
	#define IBUS_PROP_LIST_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_PROP_LIST, IBusPropListCla
	ss))
	/**		/**
	* IBusPropType:		* IBusPropType:
	* @PROP_TYPE_NORMAL: Property is shown as normal text.		* @PROP_TYPE_NORMAL: Property is shown as normal text.
	* @PROP_TYPE_TOGGLE: Property is shown as a toggle button.		* @PROP_TYPE_TOGGLE: Property is shown as a toggle button.
	* @PROP_TYPE_RADIO: Property is shown as a radio selection option.		* @PROP_TYPE_RADIO: Property is shown as a radio selection option.
	* @PROP_TYPE_MENU: Property is shown as a menu, usually imply it has sub m enu		* @PROP_TYPE_MENU: Property is shown as a menu, usually imply it has sub m enu
	* items.		* items.
	* @PROP_TYPE_SEPARATOR: A separator for menu.		* @PROP_TYPE_SEPARATOR: A separator for menu.
	*		*
	* Type enumeration of IBusProperty.		* Type enumeration of IBusProperty.
	skipping to change at line 165		skipping to change at line 108
	* No effect on other types.		* No effect on other types.
	*/		*/
	typedef enum {		typedef enum {
	PROP_STATE_UNCHECKED = 0,		PROP_STATE_UNCHECKED = 0,
	PROP_STATE_CHECKED = 1,		PROP_STATE_CHECKED = 1,
	PROP_STATE_INCONSISTENT = 2,		PROP_STATE_INCONSISTENT = 2,
	} IBusPropState;		} IBusPropState;
	typedef struct _IBusProperty IBusProperty;		typedef struct _IBusProperty IBusProperty;
	typedef struct _IBusPropertyClass IBusPropertyClass;		typedef struct _IBusPropertyClass IBusPropertyClass;
			#ifndef __PROPLIST_DEFINED
			#define __PROPLIST_DEFINED
	typedef struct _IBusPropList IBusPropList;		typedef struct _IBusPropList IBusPropList;
	typedef struct _IBusPropListClass IBusPropListClass;		typedef struct _IBusPropListClass IBusPropListClass;
			#endif
	/**		/**
	* IBusProperty:		* IBusProperty:
	* @key: Unique Identity for the IBusProperty.		* @key: Unique Identity for the IBusProperty.
	* @icon: Icon file for the IBusProperty.		* @icon: Icon file for the IBusProperty.
	* @label: Text shown in UI.		* @label: Text shown in UI.
	* @tooltip: Message shown if mouse hovered the IBusProperty.		* @tooltip: Message shown if mouse hovered the IBusProperty.
	* @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.		* @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
	* @visible: Whether the IBusProperty is visible.		* @visible: Whether the IBusProperty is visible.
	* @type: IBusPropType of IBusProperty.		* @type: IBusPropType of IBusProperty.
	skipping to change at line 204		skipping to change at line 151
	guint type;		guint type;
	guint state;		guint state;
	IBusPropList *sub_props;		IBusPropList *sub_props;
	};		};
	struct _IBusPropertyClass {		struct _IBusPropertyClass {
	IBusSerializableClass parent;		IBusSerializableClass parent;
	};		};
	/**
	* IBusPropList:
	* @properties: GArray that holds IBusProperties.
	*
	* An array of IBusProperties.
	*/
	struct _IBusPropList {
	IBusSerializable parent;
	/*< public >*/
	GArray *properties;
	};
	struct _IBusPropListClass {
	IBusSerializableClass parent;
	};
	GType ibus_property_get_type ();		GType ibus_property_get_type ();
	/**		/**
	* ibus_property_new:		* ibus_property_new:
	* @key: Unique Identity for the IBusProperty.		* @key: Unique Identity for the IBusProperty.
	* @type: IBusPropType of IBusProperty.		* @type: IBusPropType of IBusProperty.
	* @label: Text shown in UI.		* @label: Text shown in UI.
	* @icon: Icon file for the IBusProperty.		* @icon: Icon file for the IBusProperty.
	* @tooltip: Message shown if mouse hovered the IBusProperty.		* @tooltip: Message shown if mouse hovered the IBusProperty.
	* @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.		* @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
	skipping to change at line 332		skipping to change at line 262
	* @returns: TRUE for update suceeded; FALSE otherwise.		* @returns: TRUE for update suceeded; FALSE otherwise.
	*		*
	* Update the content of an IBusProperty.		* Update the content of an IBusProperty.
	* IBusProperty @prop_update can either be sub-property of @prop,		* IBusProperty @prop_update can either be sub-property of @prop,
	* or holds new values for @prop.		* or holds new values for @prop.
	*/		*/
	gboolean ibus_property_update (IBusProperty *prop,		gboolean ibus_property_update (IBusProperty *prop,
	IBusProperty *prop_update);		IBusProperty *prop_update);
	GType ibus_prop_list_get_type ();
	/**
	* ibus_prop_list_new:
	* @returns: A newly allocated IBusPropList.
	*
	* New a IBusPropList.
	*/
	IBusPropList *ibus_prop_list_new ();
	/**
	* ibus_prop_list_append:
	* @prop_list: An IBusPropList.
	* @prop: IBusProperty to be append to @prop_list.
	*
	* Append an IBusProperty to an IBusPropList, and increase reference.
	*/
	void ibus_prop_list_append (IBusPropList *prop_list,
	IBusProperty *prop);
	/**
	* ibus_prop_list_get:
	* @prop_list: An IBusPropList.
	* @index: Index of an IBusPropList.
	* @returns: IBusProperty at given index, NULL if no such IBusProperty.
	*
	* Returns IBusProperty at given index. Borrowed reference.
	*/
	IBusProperty *ibus_prop_list_get (IBusPropList *prop_list,
	guint index);
	/**
	* ibus_prop_list_update_property:
	* @prop_list: An IBusPropList.
	* @prop: IBusProperty to be update.
	* @returns: TRUE if succeeded, FALSE otherwise.
	*
	* Update an IBusProperty in IBusPropList.
	*/
	gboolean ibus_prop_list_update_property
	(IBusPropList *prop_list,
	IBusProperty *prop);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	121 lines changed or deleted		4 lines changed or added

	ibusproxy.h		ibusproxy.h
	skipping to change at line 169		skipping to change at line 169
	* @proxy: An IBusProxy.		* @proxy: An IBusProxy.
	* @method: The method to be called.		* @method: The method to be called.
	* @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: 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_repl y_and_block() to do the actual sending.		* If the IBusMessagwe is not NULL, it calls ibus_connection_send_with_rep ly_and_block() to do the actual sending.
	*		*
	* @see_also: ibus_connection_send_with_reply_and_block(),		* @see_also: ibus_connection_send_with_reply_and_block(),
	* @see_also: ibus_proxy_call(), ibus_proxy_send_with_reply(), ibus_proxy_c all_with_reply_and_block().		* @see_also: ibus_proxy_call(), ibus_proxy_send_with_reply(), ibus_proxy_c all_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,
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ibusservice.h		ibusservice.h
	skipping to change at line 69		skipping to change at line 69
	/**		/**
	* IBusService:		* IBusService:
	*		*
	* An opaque data type representing an IBusService.		* An opaque data type representing an IBusService.
	*/		*/
	struct _IBusService {		struct _IBusService {
	IBusObject parent;		IBusObject parent;
	/* instance members */		/* instance members */
	};		};
			/**
			* ServiceIBusMessageFunc:
			* @service: An IBsService.
			* @connection: Connection to IBus daemon.
			* @message: IBusMessage to be sent.
			* @returns: %TRUE if succeed; %FALSE if failed.
			*
			* Prototype of IBus service message sending callback function.
			*/
	typedef gboolean (* ServiceIBusMessageFunc) (IBusService *service,		typedef gboolean (* ServiceIBusMessageFunc) (IBusService *service,
	IBusConnection *connection ,		IBusConnection *connection ,
	IBusMessage *message);		IBusMessage *message);
			/**
			* ServiceIBusSignalFunc:
			* @service: An IBsService.
			* @connection: Connection to IBus daemon.
			* @message: IBusMessage to be sent.
			* @returns: %TRUE if succeed; %FALSE if failed.
			*
			* Prototype of IBus service signal sending callback function.
			*/
	typedef gboolean (* ServiceIBusSignalFunc) (IBusService *service,		typedef gboolean (* ServiceIBusSignalFunc) (IBusService *service,
	IBusConnection *connection ,		IBusConnection *connection ,
	IBusMessage *message);		IBusMessage *message);
	struct _IBusServiceClass {		struct _IBusServiceClass {
	IBusObjectClass parent;		IBusObjectClass parent;
	/* signals */		/* signals */
	gboolean (* ibus_message) (IBusService *service,		gboolean (* ibus_message) (IBusService *service,
	IBusConnection *connection,		IBusConnection *connection,
End of changes. 2 change blocks.
	0 lines changed or deleted		19 lines changed or added

	ibustext.h		ibustext.h
	skipping to change at line 36		skipping to change at line 36
	* An IBusText is the main text object in IBus.		* An IBusText is the main text object in IBus.
	* The text is decorated according to associated IBusAttribute,		* The text is decorated according to associated IBusAttribute,
	* e.g. the foreground/background color, underline, and		* e.g. the foreground/background color, underline, and
	* applied scope.		* applied scope.
	*/		*/
	#ifndef __IBUS_TEXT_H_		#ifndef __IBUS_TEXT_H_
	#define __IBUS_TEXT_H_		#define __IBUS_TEXT_H_
	#include "ibusserializable.h"		#include "ibusserializable.h"
	#include "ibusattribute.h"		#include "ibusattrlist.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	/* define IBusText macros */		/* define IBusText macros */
	#define IBUS_TYPE_TEXT \		#define IBUS_TYPE_TEXT \
	(ibus_text_get_type ())		(ibus_text_get_type ())
	#define IBUS_TEXT(obj) \		#define IBUS_TEXT(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_TEXT, IBusText))		(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_TEXT, IBusText))
	#define IBUS_TEXT_CLASS(klass) \		#define IBUS_TEXT_CLASS(klass) \
End of changes. 1 change blocks.
	1 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 (2)		#define IBUS_MINOR_VERSION (2)
	/**		/**
	* IBUS_MICRO_VERSION:		* IBUS_MICRO_VERSION:
	*		*
	* IBus micro version.		* IBus micro version.
	*/		*/
	#define IBUS_MICRO_VERSION (1)		#define IBUS_MICRO_VERSION (99)
	/**		/**
	* 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

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