ibus.h		ibus.h
	skipping to change at line 23		skipping to change at line 23
	* 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.
	*/		*/
	#ifndef __IBUS_H_		#ifndef __IBUS_H_
	#define __IBUS_H_		#define __IBUS_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 <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>
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ibusengine.h		ibusengine.h
	skipping to change at line 271		skipping to change at line 271
	*		*
	* Hide the lookup table.		* Hide the lookup table.
	*/		*/
	void ibus_engine_hide_lookup_table		void ibus_engine_hide_lookup_table
	(IBusEngine *engine);		(IBusEngine *engine);
	/**		/**
	* ibus_engine_forward_key_event:		* ibus_engine_forward_key_event:
	* @engine: An IBusEngine.		* @engine: An IBusEngine.
	* @keyval: KeySym.		* @keyval: KeySym.
			* @keycode: keyboard scancode.
	* @state: Key modifier flags.		* @state: Key modifier flags.
	*		*
	* Forward the key event.		* Forward the key event.
	*/		*/
	void ibus_engine_forward_key_event		void ibus_engine_forward_key_event
	(IBusEngine *engine,		(IBusEngine *engine,
	guint keyval,		guint keyval,
			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.
	*/		*/
	void ibus_engine_register_properties		void ibus_engine_register_properties
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	ibusinputcontext.h		ibusinputcontext.h
	skipping to change at line 25		skipping to change at line 25
	* 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: ibusinputcontext		* SECTION: ibusinputcontext
	* @short_description: IBus input context proxy object.		* @short_description: IBus input context proxy object.
	* @stability: Stable		* @stability: Stable
	*		*
	* An IBusInputContext is a proxy object of InputContext.		* An IBusInputContext is a proxy object of BusInputContext,
	* Clients call the IBusInputContext to invoke InputContext,		* which manages the context for input methods that supports
	* through which invoke IBusEngine.		* text input in various natural languages.
			*
			* Clients call the IBusInputContext to invoke BusInputContext,
			* through which invokes IBusEngine.
	*/		*/
	#ifndef __IBUS_INPUT_CONTEXT_H_		#ifndef __IBUS_INPUT_CONTEXT_H_
	#define __IBUS_INPUT_CONTEXT_H_		#define __IBUS_INPUT_CONTEXT_H_
	#include "ibusproxy.h"		#include "ibusproxy.h"
	/*		/*
	* Type macros.		* Type macros.
	*/		*/
	skipping to change at line 57		skipping to change at line 60
	#define IBUS_IS_INPUT_CONTEXT_CLASS(klass) \		#define IBUS_IS_INPUT_CONTEXT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_INPUT_CONTEXT))		(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_INPUT_CONTEXT))
	#define IBUS_INPUT_CONTEXT_GET_CLASS(obj) \		#define IBUS_INPUT_CONTEXT_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_INPUT_CONTEXT, IBusInputCo ntextClass))		(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_INPUT_CONTEXT, IBusInputCo ntextClass))
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _IBusInputContext IBusInputContext;		typedef struct _IBusInputContext IBusInputContext;
	typedef struct _IBusInputContextClass IBusInputContextClass;		typedef struct _IBusInputContextClass IBusInputContextClass;
			/**
			* IBusInputContext:
			*
			* An opaque data type representing an IBusInputContext.
			*/
	struct _IBusInputContext {		struct _IBusInputContext {
	IBusProxy parent;		IBusProxy parent;
	/* instance members */		/* instance members */
	};		};
	struct _IBusInputContextClass {		struct _IBusInputContextClass {
	IBusProxyClass parent;		IBusProxyClass parent;
	/* signals */		/* signals */
	/*< private >*/		/*< private >*/
	/* padding */		/* padding */
	gpointer pdummy[24];		gpointer pdummy[24];
	};		};
	GType ibus_input_context_get_type (void);		GType ibus_input_context_get_type (void);
			/**
			* ibus_input_context_new:
			* @path: The path to the object that emitting the signal.
			* @connection: An IBusConnection.
			* @returns: A newly allocated IBusInputContext.
			*
			* New an IBusInputContext.
			*/
	IBusInputContext		IBusInputContext
	*ibus_input_context_new (const gchar *path,		*ibus_input_context_new (const gchar *path,
	IBusConnection *connection );		IBusConnection *connection );
			/**
			* ibus_input_context_process_key_event:
			* @context: An IBusInputContext.
			* @keyval: Key symbol of a key event.
			* @keycode: Keycode of a key event.
			* @state: Key modifier flags.
			* @returns: TRUE for successfully process the key; FALSE otherwise.
			*
			* Pass the key event to input method engine.
			*
			* Key symbols are characters/symbols produced by key press, for example,
			* pressing "s" generates key symbol "s"; pressing shift-"s" generates key
			symbol "S".
			* Same key on keyboard may produce different key symbols on different keyb
			oard layout.
			* e.g., "s" key on QWERTY keyboard produces "o" in DVORAK layout.
			*
			* Unlike key symbol, keycode is only determined by the location of the key
			, and
			* irrelevant of the keyboard layout.
			*
			* Briefly speaking, input methods that expect certain keyboard layout shou
			ld use
			* keycode; otherwise keyval is sufficient.
			* For example, Chewing, Cangjie, Wubi expect an en-US QWERTY keyboard, the
			se should
			* use keycode; while pinyin can rely on keyval only, as it is less sensiti
			ve to
			* the keyboard layout change, DVORAK users can still use DVORAK layout to
			input pinyin.
			*
			* Use ibus_keymap_lookup_keysym() to convert keycode to keysym in given ke
			yboard layout.
			*
			* @see_also: #IBusEngine::process-key-event
			*/
	gboolean ibus_input_context_process_key_event		gboolean ibus_input_context_process_key_event
	(IBusInputContext *context,		(IBusInputContext *context,
	guint32 keyval,		guint32 keyval,
	guint32 keycode,		guint32 keycode,
	guint32 state);		guint32 state);
			/**
			* ibus_input_context_set_cursor_location:
			* @context: An IBusInputContext.
			* @x: X coordinate of the cursor.
			* @y: Y coordinate of the cursor.
			* @w: Width of the cursor.
			* @h: Height of the cursor.
			*
			* Set the cursor location of IBus input context.
			*
			* @see_also: #IBusEngine::set-cursor-location
			*/
	void ibus_input_context_set_cursor_location		void ibus_input_context_set_cursor_location
	(IBusInputContext *context,		(IBusInputContext *context,
	gint32 x,		gint32 x,
	gint32 y,		gint32 y,
	gint32 w,		gint32 w,
	gint32 h);		gint32 h);
			/**
			* ibus_input_context_set_capabilities:
			* @context: An IBusInputContext.
			* @capabilities: Capabilities flags of IBusEngine, see #IBusCapabilite
			*
			* Set the capabilities flags of client application.
			*
			* @see_also: #IBusEngine::set-capabilities
			*/
	void ibus_input_context_set_capabilities		void ibus_input_context_set_capabilities
	(IBusInputContext *context,		(IBusInputContext *context,
	guint32 capabilite		guint32 capabiliti
	s);		es);
			/**
			* ibus_input_context_focus_in:
			* @context: An IBusInputContext.
			*
			* Invoked when the client application get focus.
			*
			* @see_also: #IBusEngine::focus_in.
			*/
	void ibus_input_context_focus_in (IBusInputContext *context);		void ibus_input_context_focus_in (IBusInputContext *context);
			/**
			* ibus_input_context_focus_out:
			* @context: An IBusInputContext.
			*
			* Invoked when the client application get focus.
			*
			* @see_also: #IBusEngine::focus_out.
			*/
	void ibus_input_context_focus_out (IBusInputContext *context);		void ibus_input_context_focus_out (IBusInputContext *context);
			/**
			* ibus_input_context_reset:
			* @context: An IBusInputContext.
			*
			* Invoked when the IME is reset.
			*
			* @see_also: #IBusEngine::reset
			*/
	void ibus_input_context_reset (IBusInputContext *context);		void ibus_input_context_reset (IBusInputContext *context);
			/**
			* ibus_input_context_enable:
			* @context: An IBusInputContext.
			*
			* Invoked when the IME is enabled, either by IME switch hotkey or select f
			rom the menu.
			*
			* @see_also: #IBusEngine::enable
			*/
	void ibus_input_context_enable (IBusInputContext *context);		void ibus_input_context_enable (IBusInputContext *context);
			/**
			* ibus_input_context_disable:
			* @context: An IBusInputContext.
			*
			* Invoked when the IME is disabled, either by IME switch hotkey or select
			from the menu.
			*
			* @see_also: #IBusEngine::disable
			*/
	void ibus_input_context_disable (IBusInputContext *context);		void ibus_input_context_disable (IBusInputContext *context);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 11 change blocks.
	5 lines changed or deleted		127 lines changed or added

	ibuskeymap.h		ibuskeymap.h
	skipping to change at line 22		skipping to change at line 22
	* 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: ibuskeymap		* SECTION: ibuskeymap
	* @short_description: Keymap with decorating information.		* @short_description: Keyboard mapping handling.
			* @stability: Stable
			* @see_also: #IBusComponent, #IBusEngineDesc
			*
			* An IBusKeymap defines the mapping between keyboard scancodes and
			* keyboard symbols such as numbers, alphabets, and punctuation marks.
			*
			* Some input methods assume certain keyboard layout
			* (such as Chewing and Wubi requires an US-QWERTY layout),
			* and expect key symbols to be arranged in that order.
			* These input methods should new an IBusKeymap
			* instance and define the keyboard layout.
			* Then ibus_keymap_lookup_keysym() can
			* convert scancodes back to the key symbols.
	*		*
	*/		*/
	#ifndef __IBUS_KEYMAP_H_		#ifndef __IBUS_KEYMAP_H_
	#define __IBUS_KEYMAP_H_		#define __IBUS_KEYMAP_H_
	#include "ibusobject.h"		#include "ibusobject.h"
	/*		/*
	* Type macros.		* Type macros.
	skipping to change at line 52		skipping to change at line 65
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_KEYMAP))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_KEYMAP))
	#define IBUS_IS_KEYMAP_CLASS(klass) \		#define IBUS_IS_KEYMAP_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_KEYMAP))		(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_KEYMAP))
	#define IBUS_KEYMAP_GET_CLASS(obj) \		#define IBUS_KEYMAP_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_KEYMAP, IBusKeymapClass))		(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_KEYMAP, IBusKeymapClass))
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _IBusKeymap IBusKeymap;		typedef struct _IBusKeymap IBusKeymap;
	typedef struct _IBusKeymapClass IBusKeymapClass;		typedef struct _IBusKeymapClass IBusKeymapClass;
			/**
			* KEYMAP:
			*
			* Data structure for storing keymap.
			*/
	typedef guint KEYMAP[256][5];		typedef guint KEYMAP[256][5];
	/**		/**
	* IBusKeymap:		* IBusKeymap:
			* @name: The name of the keymap, such as 'us', 'jp'.
			* @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 >*/
	IBusObject parent;		IBusObject parent;
	/* members */		/* members */
	/*< public >*/		/*< public >*/
	gchar *name;		gchar *name;
	KEYMAP keymap;		KEYMAP keymap;
	};		};
	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: keymap name.		* @name: The keymap file to be loaded, such as 'us', 'jp'.
	* @returns: A newly allocated IBusKeymap.		* @returns: A newly allocated IBusKeymap; or NULL if failed.
	*		*
	* New an IBusKeymap.		* New an IBusKeymap.
			*
			* This function loads the keymap file specified in @name
			* in the IBUS_DATA_DIR/keymaps directory.
	*/		*/
	IBusKeymap *ibus_keymap_new (const gchar *na me);		IBusKeymap *ibus_keymap_new (const gchar *na me);
			/**
			* ibus_keymap_lookup_keysym:
			* @keymap: An IBusKeymap.
			* @keycode: A scancode to be converted.
			* @state: Modifier flags(such as Ctrl, Shift).
			* @returns: Corresponding keysym.
			*
			* Convert the scancode to keysym, given the keymap.
			*/
	guint ibus_keymap_lookup_keysym (IBusKeymap *ke ymap,		guint ibus_keymap_lookup_keysym (IBusKeymap *ke ymap,
	guint16 ke ycode,		guint16 ke ycode,
	guint32 st ate);		guint32 st ate);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 8 change blocks.
	4 lines changed or deleted		39 lines changed or added

	ibuskeysyms.h		ibuskeysyms.h
	skipping to change at line 19		skipping to change at line 19
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software 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: ibuskeysyms
			* @short_description: Key symbol definition.
			* @stability: Stable
			* @see_also: #IBusKeymap, #IBusHotkeyProfile
			*
			* This section defines the key symbols (keysym) used in IBus.
			* Those keysym data is converted from keysymdef.h in
			* FreeDesktop.
			*
			* Most of the key symbols are not explicit documented,
			* because they are self-explaining.
			*/
	#ifndef __IBUS_KEYSYMS_H__		#ifndef __IBUS_KEYSYMS_H__
	#define __IBUS_KEYSYMS_H__		#define __IBUS_KEYSYMS_H__
	#define IBUS_VoidSymbol 0xffffff		#define IBUS_VoidSymbol 0xffffff
	#define IBUS_BackSpace 0xff08		#define IBUS_BackSpace 0xff08
	#define IBUS_Tab 0xff09		#define IBUS_Tab 0xff09
	#define IBUS_Linefeed 0xff0a		#define IBUS_Linefeed 0xff0a
	#define IBUS_Clear 0xff0b		#define IBUS_Clear 0xff0b
	#define IBUS_Return 0xff0d		#define IBUS_Return 0xff0d
	#define IBUS_Pause 0xff13		#define IBUS_Pause 0xff13
	#define IBUS_Scroll_Lock 0xff14		#define IBUS_Scroll_Lock 0xff14
	#define IBUS_Sys_Req 0xff15		#define IBUS_Sys_Req 0xff15
	#define IBUS_Escape 0xff1b		#define IBUS_Escape 0xff1b
	#define IBUS_Delete 0xffff		#define IBUS_Delete 0xffff
			/**
			* IBUS_Multi_key:
			*
			* Key for composing characters.
			* A.k.a. Compose Key.
			*/
	#define IBUS_Multi_key 0xff20		#define IBUS_Multi_key 0xff20
			/**
			* IBUS_Codeinput:
			*
			* International and multi-key character composition.
			*/
	#define IBUS_Codeinput 0xff37		#define IBUS_Codeinput 0xff37
	#define IBUS_SingleCandidate 0xff3c		#define IBUS_SingleCandidate 0xff3c
	#define IBUS_MultipleCandidate 0xff3d		#define IBUS_MultipleCandidate 0xff3d
	#define IBUS_PreviousCandidate 0xff3e		#define IBUS_PreviousCandidate 0xff3e
			/**
			* IBUS_Kanji:
			*
			* Japanese keyboard support.
			*/
	#define IBUS_Kanji 0xff21		#define IBUS_Kanji 0xff21
			/**
			* IBUS_Muhenkan:
			*
			* Japanese keyboard support.
			*/
	#define IBUS_Muhenkan 0xff22		#define IBUS_Muhenkan 0xff22
			/**
			* IBUS_Henkan_Mode:
			*
			* Japanese keyboard support.
			*/
	#define IBUS_Henkan_Mode 0xff23		#define IBUS_Henkan_Mode 0xff23
			/**
			* IBUS_Henkan:
			*
			* Japanese keyboard support.
			*/
	#define IBUS_Henkan 0xff23		#define IBUS_Henkan 0xff23
			/**
			* IBUS_Romaji:
			*
			* Japanese keyboard support.
			*/
	#define IBUS_Romaji 0xff24		#define IBUS_Romaji 0xff24
			/**
			* IBUS_Hiragana:
			*
			* Japanese keyboard support.
			*/
	#define IBUS_Hiragana 0xff25		#define IBUS_Hiragana 0xff25
			/**
			* IBUS_Katakana:
			*
			* Japanese keyboard support.
			*/
	#define IBUS_Katakana 0xff26		#define IBUS_Katakana 0xff26
			/**
			* IBUS_Hiragana_Katakana:
			*
			* Japanese keyboard support.
			*/
	#define IBUS_Hiragana_Katakana 0xff27		#define IBUS_Hiragana_Katakana 0xff27
	#define IBUS_Zenkaku 0xff28		#define IBUS_Zenkaku 0xff28
	#define IBUS_Hankaku 0xff29		#define IBUS_Hankaku 0xff29
	#define IBUS_Zenkaku_Hankaku 0xff2a		#define IBUS_Zenkaku_Hankaku 0xff2a
	#define IBUS_Touroku 0xff2b		#define IBUS_Touroku 0xff2b
	#define IBUS_Massyo 0xff2c		#define IBUS_Massyo 0xff2c
	#define IBUS_Kana_Lock 0xff2d		#define IBUS_Kana_Lock 0xff2d
	#define IBUS_Kana_Shift 0xff2e		#define IBUS_Kana_Shift 0xff2e
	#define IBUS_Eisu_Shift 0xff2f		#define IBUS_Eisu_Shift 0xff2f
	#define IBUS_Eisu_toggle 0xff30		#define IBUS_Eisu_toggle 0xff30
End of changes. 11 change blocks.
	0 lines changed or deleted		74 lines changed or added

	ibuslookuptable.h		ibuslookuptable.h
	skipping to change at line 66		skipping to change at line 66
	typedef struct _IBusLookupTable IBusLookupTable;		typedef struct _IBusLookupTable IBusLookupTable;
	typedef struct _IBusLookupTableClass IBusLookupTableClass;		typedef struct _IBusLookupTableClass IBusLookupTableClass;
	/**		/**
	* IBusLookupTable:		* IBusLookupTable:
	* @page_size: number of candidate shown per page.		* @page_size: number of candidate shown per page.
	* @cursor_pos: position index of cursor.		* @cursor_pos: position index of cursor.
	* @cursor_visible: whether the cursor is visible.		* @cursor_visible: whether the cursor is visible.
	* @round: TRUE for lookup table wrap around.		* @round: TRUE for lookup table wrap around.
	* @candidates: Candidate words/phrases/		* @candidates: Candidate words/phrases.
			* @labels: Candidate labels which identify individual candidates in the sa
			me page. Default is 1, 2, 3, 4 ...
	*		*
	* An IBusLookuptable stores the candidate words or phrases for users to ch oose from.		* An IBusLookuptable stores the candidate words or phrases for users to ch oose from.
			* Note that some input methods allow you to select candidate by pressing n
			on-numeric
			* keys such as "asdfghjkl;".
			* Developers of these input methods should change the labels with
			* ibus_lookup_table_append_label().
	*/		*/
	struct _IBusLookupTable {		struct _IBusLookupTable {
	IBusSerializable parent;		IBusSerializable parent;
	/*< public >*/		/*< public >*/
	guint page_size;		guint page_size;
	guint cursor_pos;		guint cursor_pos;
	gboolean cursor_visible;		gboolean cursor_visible;
	gboolean round;		gboolean round;
	skipping to change at line 130		skipping to change at line 135
	*		*
	* Return IBusText at the given index.		* Return IBusText at the given index.
	*/		*/
	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.
	* @text: candidate word/phrase to be appended (in IBusText format).		* @text: A candidate label to be appended (in IBusText format).
	*		*
	* Append a candidate word/phrase to IBusLookupTable.		* Append a candidate word/phrase to IBusLookupTable.
			* This function is needed if the input method select candidate with
			* non-numeric keys such as "asdfghjkl;".
	*/		*/
	void ibus_lookup_table_append_label		void ibus_lookup_table_append_label
	(IBusLookupTable *table,		(IBusLookupTable *table,
	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: IBusText at the given index; NULL if no such IBusText.
End of changes. 4 change blocks.
	2 lines changed or deleted		11 lines changed or added

	ibusmainloop.h		ibusmainloop.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software 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: ibusmainloop
			* @short_description: DBus server and connection setup functions.
			* @stability: Stable
			*
			* This section defines the DBus server and connection setup 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 <dbus/dbus.h>
			/**
			* DBusConnectionSetupFunc:
			* @connection: A DBusConnection
			* @user_data: User data to be passed to callback 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);
			/**
			* DBusServerSetupFunc:
			* @server: A DBusConnection
			* @user_data: User data to be passed to callback function.
			*
			* A prototype of DBus server setup function.
			*/
	typedef void (* DBusServerSetupFunc) (DBusServer *server,		typedef void (* DBusServerSetupFunc) (DBusServer *server,
	gpointer user_data);		gpointer user_data);
			/**
			* ibus_mainloop_setup:
			* @connection_func: A DBus connection setup function.
			* @server_func: A prototype of DBus server setup function.
			* @user_data: User data to be passed to callback function.
			*
			* Sets the watch and timeout functions of a #DBusConnection
			* and #DBusServer to integrate the connection with the GLib main loop.
			*
			* Parameter @user_data should be in type #GMainContext.
			* It will be passed to both callback functions,
			* however, normally %NULL is sufficient.
			*
			* If called twice for the same user_data, does nothing the second
			* time. If called once with user_data A and once with user_data B,
			* user_data B replaces user_data A as the context monitoring the
			* connection.
			*
			* @see_also: ibus_dbus_connection_setup(), ibus_dbus_server_setup().
			*/
	void ibus_mainloop_setup (DBusConnectionSetupFunc connectio n_func,		void ibus_mainloop_setup (DBusConnectionSetupFunc connectio n_func,
	DBusServerSetupFunc server_fu nc,		DBusServerSetupFunc server_fu nc,
	gpointer user_data );		gpointer user_data );
			/**
			* ibus_dbus_server_setup:
			* @server: A DBusServer.
			*
			* Sets the watch and timeout functions of a #DBusServer
			* to integrate the server with the GLib main loop.
			*
			* This function uses the parameter @user_data and
			* server_func set with ibus_mainloop_setup(),
			* or fall back to NULL and dbus_server_setup() if those are not defined.
			*
			* @see_also: ibus_mainloop_setup(), dbus_server_setup().
			*/
	void ibus_dbus_server_setup (DBusServer *server);		void ibus_dbus_server_setup (DBusServer *server);
			/**
			* dbus_connection_setup:
			* @connection: A DBusConnection.
			*
			* Sets the watch and timeout functions of a #DBusConnection
			* to integrate the connection with the GLib main loop.
			*
			* This function uses the parameter @user_data and
			* connection_func set with ibus_mainloop_setup(),
			* or fall back to NULL and dbus_connection_setup() if those are not define
			d.
			*
			* @see_also: ibus_mainloop_setup(), dbus_connection_setup().
			*/
	void ibus_dbus_connection_setup (DBusConnection *connectio n);		void ibus_dbus_connection_setup (DBusConnection *connectio n);
	#endif		#endif
End of changes. 6 change blocks.
	0 lines changed or deleted		73 lines changed or added

	ibusmessage.h		ibusmessage.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software 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
			* @short_description: A DBusMessage in IBus.
			* @stability: Stable
			*
			* An IBusMessage is essentially a DBusMessage, which representing a messag
			e received from or to
			* be sent to another application.
			*
			* Besides DBusMessage functions, An IBusMessage can be manipulated
			* 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 <dbus/dbus.h>
	#include "ibuserror.h"		#include "ibuserror.h"
			/**
			* IBUS_TYPE_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 ())
			/**
			* IBUS_TYPE_ARRAY:
			*
			* Type of IBusArray.
			*/
	#define IBUS_TYPE_ARRAY (ibus_type_get_array ())		#define IBUS_TYPE_ARRAY (ibus_type_get_array ())
			/**
			* IBUS_TYPE_STRUCT:
			*
			* Type of IBusStruct.
			*/
	#define IBUS_TYPE_STRUCT (ibus_type_get_struct ())		#define IBUS_TYPE_STRUCT (ibus_type_get_struct ())
			/**
			* IBUS_TYPE_DICT_ENTRY:
			*
			* Type of IBusDictEntry.
			*/
	#define IBUS_TYPE_DICT_ENTRY (ibus_type_get_dict_entry ())		#define IBUS_TYPE_DICT_ENTRY (ibus_type_get_dict_entry ())
			/**
			* IBUS_TYPE_VARIANT:
			*
			* 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;		typedef DBusMessage IBusMessage;
			/**
			* IBusMessageIter:
			*
			* An opaque data structure that represents IBusMessageIter.
			*/
	typedef DBusMessageIter IBusMessageIter;		typedef DBusMessageIter IBusMessageIter;
			/**
			* ibus_type_get_object_path:
			* @returns: 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:
			* @returns: Type of IBusArray.
			*
			* Gets the type of IBusArray.
			*/
	GType ibus_type_get_array (void);		GType ibus_type_get_array (void);
			/**
			* ibus_type_get_struct:
			* @returns: Type of IBusStruct.
			*
			* Gets the type of IBusStruct.
			*/
	GType ibus_type_get_struct (void);		GType ibus_type_get_struct (void);
			/**
			* ibus_type_get_dict_entry:
			* @returns: Type of IBusDictEntry.
			*
			* Gets the type of IBusDictEntry.
			*/
	GType ibus_type_get_dict_entry (void);		GType ibus_type_get_dict_entry (void);
			/**
			* ibus_type_get_variant:
			* @returns: Type of IBusVariant.
			*
			* Gets the type of IBusVariant.
			*/
	GType ibus_type_get_variant (void);		GType ibus_type_get_variant (void);
			/**
			* ibus_message_new:
			* @message_type: Type of the message.
			* @returns: A newly allocated IBusMessage according to @message_type.
			*
			* New an IBusMessage.
			* Valid D-Bus message types include:
			* <itemizedlist>
			* <listitem>
			* <para>#DBUS_MESSAGE_TYPE_METHOD_CALL</para>
			* </listitem>
			* <listitem>
			* <para>#DBUS_MESSAGE_TYPE_METHOD_RETURN</para>
			* </listitem>
			* <listitem>
			* <para>#DBUS_MESSAGE_TYPE_METHOD_ERROR</para>
			* </listitem>
			* <listitem>
			* <para>#DBUS_MESSAGE_TYPE_METHOD_SIGNAL</para>
			* </listitem>
			* </itemizedlist>
			* These are defined in dbus-protocol.h in D-Bus.
			*/
	IBusMessage *ibus_message_new (gint messag e_type);		IBusMessage *ibus_message_new (gint messag e_type);
			/**
			* ibus_message_ref:
			* @message: An IBusMessage.
			* @returns: The IBusMessage.
			*
			* Increments the reference count of an IBusMessage.
			*/
	IBusMessage *ibus_message_ref (IBusMessage *messag e);		IBusMessage *ibus_message_ref (IBusMessage *messag e);
			/**
			* ibus_message_unref:
			* @message: An IBusMessage.
			*
			* Decrements the reference count of a DBusMessage, freeing the message if
			the count reaches 0.
			*/
	void ibus_message_unref (IBusMessage *messag e);		void ibus_message_unref (IBusMessage *messag e);
			/**
			* ibus_message_new_method_call:
			* @destination: Where this message to be sent to or %NULL for no destinati
			on.
			* @path: Object path the message should be sent to.
			* @interface: Interface to invoke method on, or %NULL.
			* @method: The method to be invoked.
			* @returns: A newly allocate IBusMessage; or %NULL if memory cannot be all
			ocated.
			*
			* Constructs a new message to invoke a method on a remote object.
			*
			* The destination may be %NULL in which case no destination is set;
			* this is appropriate when using IBus/D-Bus in a peer-to-peer context (no
			message bus).
			* The interface may be %NULL, which means that if multiple methods with th
			e given name
			* exist it is undefined which one will be invoked.
			*
			* The path and method names may not be %NULL.
			*
			* Destination, path, interface, and method name can't contain any invalid
			characters
			* (see the D-Bus specification).
			*/
	IBusMessage *ibus_message_new_method_call (const gchar *destin ation,		IBusMessage *ibus_message_new_method_call (const gchar *destin ation,
	const gchar *path,		const gchar *path,
	const gchar *interf ace,		const gchar *interf ace,
	const gchar *method );		const gchar *method );
			/**
			* ibus_message_new_method_return:
			* @reply_to: The IBusMessage being replied to.
			* @returns: A newly allocate IBusMessage; or %NULL if memory cannot be all
			ocated.
			*
			* Constructs a message that is a reply to a method call.
			*/
	IBusMessage *ibus_message_new_method_return (IBusMessage *reply_ to);		IBusMessage *ibus_message_new_method_return (IBusMessage *reply_ to);
			/**
			* ibus_message_new_error:
			* @reply_to: The IBusMessage being replied to.
			* @error_name: Name of the error.
			* @error_message: Detailed error message string (or %NULL for none, but pl
			ease give a message).
			* @returns: A newly allocate IBusMessage with the error information; or %N
			ULL if memory cannot be allocated.
			*
			* Creates a new message that is an error reply to another message.
			* Error replies are most common in response to method calls, but can be re
			turned in reply to any message.
			* The error name must be a valid error name according to the syntax given
			in the D-Bus specification.
			* If you don't want to make up an error name just use %DBUS_ERROR_FAILED.
			*
			* Use ibus_message_unref() to free the produced IBusMessage.
			*/
	IBusMessage *ibus_message_new_error (IBusMessage *reply_ to,		IBusMessage *ibus_message_new_error (IBusMessage *reply_ to,
	const gchar *error_ name,		const gchar *error_ name,
	const gchar *error_ message);		const gchar *error_ message);
			/**
			* ibus_message_new_error_printf:
			* @reply_to: The IBusMessage being replied to.
			* @error_name: Name of the error.
			* @error_format: Error format string as in printf() format.
			* @...: Format arguments, as in printf().
			* @returns: A newly allocate IBusMessage with the error information; or %N
			ULL if memory cannot be allocated.
			*
			* Creates a new message that is an error reply to another message.
			* Error replies are most common in response to method calls, but can be re
			turned in reply to any message.
			* The error name must be a valid error name according to the syntax given
			in the D-Bus specification.
			* If you don't want to make up an error name just use %DBUS_ERROR_FAILED.
			*/
	IBusMessage *ibus_message_new_error_printf (IBusMessage *reply_ to,		IBusMessage *ibus_message_new_error_printf (IBusMessage *reply_ to,
	const gchar *error_ name,		const gchar *error_ name,
	const gchar *error_ format,		const gchar *error_ format,
	...);		...);
			/**
			* ibus_message_new_signal:
			* @path: Object path the message should be sent to.
			* @interface: Interface to invoke method on, or %NULL.
			* @method: The method to invoke.
			* @returns: A newly allocate IBusMessage with the error information; or %N
			ULL if memory cannot be allocated.
			*
			* Constructs a new message representing a signal emission.
			* Returns NULL if memory can't be allocated for the message.
			* A signal is identified by its originating object path, interface, and th
			e name of the signal.
			* Path, interface, and signal name must all be valid (the D-Bus specificat
			ion defines the syntax of these fields).
			*/
	IBusMessage *ibus_message_new_signal (const gchar *path,		IBusMessage *ibus_message_new_signal (const gchar *path,
	const gchar *interf ace,		const gchar *interf ace,
	const gchar *method );		const gchar *method );
			/**
			* ibus_message_is_method_call:
			* @message: An IBusMessage.
			* @interface: The interface to check. Cannot be %NULL.
			* @method: The method to check. Cannot be %NULL.
			* @returns: %TRUE if @message is DBUS_MESSAGE_TYPE_METHOD_CALL and the inv
			oked method is matched with @method;
			* %FALSE otherwise.
			*
			* Checks whether the message is a method call with the given interface and
			member fields.
			*
			* If the message is not DBUS_MESSAGE_TYPE_METHOD_CALL,
			* or has a different interface or member field, returns FALSE.
			* If the interface field is missing, then it will be assumed equal to the
			provided interface.
			* The D-Bus protocol allows method callers to leave out the interface name
			.
			*/
	gboolean ibus_message_is_method_call (IBusMessage *messag e,		gboolean ibus_message_is_method_call (IBusMessage *messag e,
	const gchar *interf ace,		const gchar *interf ace,
	const gchar *method );		const gchar *method );
			/**
			* ibus_message_is_error:
			* @message: An IBusMessage.
			* @error_name: Name of the error to check.
			* @returns: %TRUE if @message is DBUS_MESSAGE_TYPE_ERROR and the error nam
			e is matched with @error_name;
			* %FALSE otherwise.
			*
			* Checks whether the message is an error reply with the given error name.
			* If the message is not DBUS_MESSAGE_TYPE_ERROR, or has a different name,
			returns FALSE.
			*/
	gboolean ibus_message_is_error (IBusMessage *messag e,		gboolean ibus_message_is_error (IBusMessage *messag e,
	const gchar *error_ name);		const gchar *error_ name);
			/**
			* ibus_message_is_signal:
			* @message: An IBusMessage.
			* @interface: The interface to checked. Cannot be %NULL.
			* @signal_name: The signal name to check.
			* @returns: %TRUE if @message is %DBUS_MESSAGE_SIGNAL and the signal name
			is matched with @signal_name;
			* %FALSE otherwise.
			*
			* Checks whether the message is a signal with the given interface and memb
			er fields.
			* If the message is not %DBUS_MESSAGE_TYPE_SIGNAL, or has a different inte
			rface or member field, returns %FALSE.
			*/
	gboolean ibus_message_is_signal (IBusMessage *messag e,		gboolean ibus_message_is_signal (IBusMessage *messag e,
	const gchar *interf ace,		const gchar *interf ace,
	const gchar *signal _name);		const gchar *signal _name);
			/**
			* ibus_message_set_destination:
			* @message: An IBusMessage.
			* @destination: Destination to set; or %NULL to unset.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Sets the message's destination.
			*
			* The destination is the name of another connection on the bus
			* and may be either the unique name assigned by the bus to each connection
			,
			* or a well-known name specified in advance.
			*
			* The destination name must contain only valid characters as defined in th
			e D-Bus specification.
			*/
	gboolean ibus_message_set_destination (IBusMessage *messag e,		gboolean ibus_message_set_destination (IBusMessage *messag e,
	const gchar *destin ation);		const gchar *destin ation);
			/**
			* ibus_message_set_sender:
			* @message: An IBusMessage.
			* @sender: Sender to set; or %NULL to unset.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Sets the message sender.
			*
			* The sender must be a valid bus name as defined in the D-Bus specificatio
			n.
			*
			* Usually you don't want to call this. The message bus daemon will call it
			to set the origin of each message.
			* If you aren't implementing a message bus daemon you shouldn't need to se
			t the sender.
			*/
	gboolean ibus_message_set_sender (IBusMessage *messag e,		gboolean ibus_message_set_sender (IBusMessage *messag e,
	const gchar *sender );		const gchar *sender );
			/**
			* ibus_message_set_error_name:
			* @message: An IBusMessage.
			* @error_name: Error name to set; or %NULL to unset.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Sets the name of the error (%DBUS_MESSAGE_TYPE_ERROR).
			*
			* The name is fully-qualified (namespaced).
			*
			* The error name must contain only valid characters as defined in the D-Bu
			s specification.
			*/
	gboolean ibus_message_set_error_name (IBusMessage *messag e,		gboolean ibus_message_set_error_name (IBusMessage *messag e,
	const gchar *error_ name);		const gchar *error_ name);
			/**
			* ibus_message_set_interface:
			* @message: An IBusMessage.
			* @interface: Interface to set; or %NULL to unset.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Sets the interface this message is being sent to
			* (for %DBUS_MESSAGE_TYPE_METHOD_CALL) or the interface
			* a signal is being emitted from (for %DBUS_MESSAGE_TYPE_SIGNAL).
			*
			* The interface name must contain only valid characters as defined in the
			D-Bus specification.
			*/
	gboolean ibus_message_set_interface (IBusMessage *messag e,		gboolean ibus_message_set_interface (IBusMessage *messag e,
	const gchar *interf ace);		const gchar *interf ace);
			/**
			* ibus_message_set_member:
			* @message: An IBusMessage.
			* @member: Member to set; or %NULL to unset.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Sets the interface member being invoked (%DBUS_MESSAGE_TYPE_METHOD_CALL)
			* or emitted (%DBUS_MESSAGE_TYPE_SIGNAL).
			*
			* The member name must contain only valid characters as defined in the D-B
			us specification.
			*/
	gboolean ibus_message_set_member (IBusMessage *messag e,		gboolean ibus_message_set_member (IBusMessage *messag e,
	const gchar *member );		const gchar *member );
			/**
			* ibus_message_set_path:
			* @message: An IBusMessage.
			* @path: Path to set; or %NULL to unset.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Sets the object path this message is being sent to (for $DBUS_MESSAGE_TY
			PE_METHOD_CALL)
			* or the one a signal is being emitted from (for %DBUS_MESSAGE_TYPE_SIGNAL
			).
			*
			* The path must contain only valid characters as defined in the D-Bus spec
			ification.
			*/
	gboolean ibus_message_set_path (IBusMessage *messag e,		gboolean ibus_message_set_path (IBusMessage *messag e,
	const gchar *path);		const gchar *path);
			/**
			* ibus_message_set_no_reply:
			* @message: An IBusMessage.
			* @no_reply: %TRUE if no reply is desired.
			*
			* Sets a flag indicating that the message does not want a reply;
			* if this flag is set, the other end of the connection may (but is not req
			uired to)
			* optimize by not sending method return or error replies.
			*
			* If this flag is set, there is no way to know whether the message success
			fully arrived
			* at the remote end.
			* Normally you know a message was received when you receive the reply to i
			t.
			*
			* The flag is FALSE by default, that is by default the other end is requir
			ed to reply.
			*
			* On the protocol level this toggles %DBUS_HEADER_FLAG_NO_REPLY_EXPECTED.
			*/
	void ibus_message_set_no_reply (IBusMessage *messag e,		void ibus_message_set_no_reply (IBusMessage *messag e,
	gboolean no_rep ly);		gboolean no_rep ly);
			/**
			* ibus_message_set_reply_serial:
			* @message: An IBusMessage.
			* @reply_serial: The serial to be replied.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Sets the reply serial of a message (the serial of the message this is a
			reply to).
			*/
	gboolean ibus_message_set_reply_serial (IBusMessage *messag e,		gboolean ibus_message_set_reply_serial (IBusMessage *messag e,
	guint32 reply_ serial);		guint32 reply_ serial);
			/**
			* ibus_message_get_type:
			* @message: An IBusMessage.
			* @returns: Type of the IBusMessage.
			*
			* Gets the type of an IBusMessage.
			*/
	gint ibus_message_get_type (IBusMessage *messag e);		gint ibus_message_get_type (IBusMessage *messag e);
			/**
			* ibus_message_get_destination:
			* @message: An IBusMessage.
			* @returns: Destination of the IBusMessage; NULL if there is none set.
			*
			* Gets the destination of a message or %NULL if there is none set.
			*
			* The returned string becomes invalid if the message is modified,
			* since it points into the wire-marshaled message data.
			*/
	const gchar *ibus_message_get_destination (IBusMessage *messag e);		const gchar *ibus_message_get_destination (IBusMessage *messag e);
			/**
			* ibus_message_get_sender:
			* @message: An IBusMessage.
			* @returns: Sender of the IBusMessage; %NULL if unknown or inapplicable.
			*
			* Gets the unique name of the connection which originated this message,
			* or %NULL if unknown or inapplicable.
			*
			* The sender is filled in by the message bus.
			*
			* Note, the returned sender is always the unique bus name.
			* Connections may own multiple other bus names, but those are not found in
			the sender field.
			*
			* The returned string becomes invalid if the message is modified,
			* since it points into the wire-marshaled message data.
			*/
	const gchar *ibus_message_get_sender (IBusMessage *messag e);		const gchar *ibus_message_get_sender (IBusMessage *messag e);
			/**
			* ibus_message_get_error_name:
			* @message: An IBusMessage.
			* @returns: Error name of the IBusMessage; %NULL if none.
			*
			* Gets the error name (%DBUS_MESSAGE_TYPE_ERROR only) or %NULL if none.
			*
			* The returned string becomes invalid if the message is modified,
			* since it points into the wire-marshaled message data.
			*/
	const gchar *ibus_message_get_error_name (IBusMessage *messag e);		const gchar *ibus_message_get_error_name (IBusMessage *messag e);
			/**
			* ibus_message_get_error_message:
			* @message: An IBusMessage.
			* @returns: Error message of the IBusMessage; %NULL if none.
			*
			* Gets the error message (%DBUS_MESSAGE_TYPE_ERROR only) or %NULL if none.
			*
			* The returned string becomes invalid if the message is modified,
			* since it points into the wire-marshaled message data.
			*/
	const gchar *ibus_message_get_error_message (IBusMessage *messag e);		const gchar *ibus_message_get_error_message (IBusMessage *messag e);
			/**
			* ibus_message_get_interface:
			* @message: An IBusMessage.
			* @returns: Interface name of the IBusMessage; %NULL if none.
			*
			* Gets the interface this message is being sent to (for %DBUS_MESSAGE_TYPE
			_METHOD_CALL)
			* or being emitted from (for %DBUS_MESSAGE_TYPE_SIGNAL).
			*
			* The interface name is fully-qualified (namespaced). Returns %NULL if non
			e.
			*
			* The returned string becomes invalid if the message is modified,
			* since it points into the wire-marshaled message data.
			*/
	const gchar *ibus_message_get_interface (IBusMessage *messag e);		const gchar *ibus_message_get_interface (IBusMessage *messag e);
			/**
			* ibus_message_get_member:
			* @message: An IBusMessage.
			* @returns: Member name of the IBusMessage; %NULL if none.
			*
			* Gets the interface member being invoked (%DBUS_MESSAGE_TYPE_METHOD_CALL)
			* or emitted (%DBUS_MESSAGE_TYPE_SIGNAL).
			*
			* Returns %NULL if none.
			*
			* The returned string becomes invalid if the message is modified,
			* since it points into the wire-marshaled message data.
			*/
	const gchar *ibus_message_get_member (IBusMessage *messag e);		const gchar *ibus_message_get_member (IBusMessage *messag e);
			/**
			* ibus_message_get_path:
			* @message: An IBusMessage.
			* @returns: Object path of the IBusMessage; %NULL if none.
			*
			* Gets the object path this message is being sent to (for %DBUS_MESSAGE_TY
			PE_METHOD_CALL)
			* or being emitted from (for %DBUS_MESSAGE_TYPE_SIGNAL).
			*
			* Returns %NULL if none.
			*
			* See also dbus_message_get_path_decomposed().
			*
			* The returned string becomes invalid if the message is modified,
			* since it points into the wire-marshaled message data.
			*/
	const gchar *ibus_message_get_path (IBusMessage *messag e);		const gchar *ibus_message_get_path (IBusMessage *messag e);
			/**
			* ibus_message_get_no_reply:
			* @message: An IBusMessage.
			* @returns: %TRUE if the message does not expect a reply; %FALSE otherwise
			.
			*
			* Returns TRUE if the message does not expect a reply.
			*/
	gboolean ibus_message_get_no_reply (IBusMessage *messag e);		gboolean ibus_message_get_no_reply (IBusMessage *messag e);
			/**
			* ibus_message_get_reply_serial:
			* @message: An IBusMessage.
			* @returns: The serial that the message is a reply to or 0 if none.
			*
			* Returns the serial that the message is a reply to or 0 if none.
			*/
	guint32 ibus_message_get_reply_serial (IBusMessage *messag e);		guint32 ibus_message_get_reply_serial (IBusMessage *messag e);
			/**
			* ibus_message_get_reply_serial:
			* @message: An IBusMessage.
			* @returns: The serial of a message or 0 if none has been specified.
			*
			* Returns the serial of a message or 0 if none has been specified.
			*
			* The message's serial number is provided by the application sending the m
			essage
			* and is used to identify replies to this message.
			*
			* All messages received on a connection will have a serial provided by the
			remote application.
			*
			* For messages you're sending, dbus_connection_send() will assign a serial
			and return it to you.
			*/
	guint32 ibus_message_get_serial (IBusMessage *messag e);		guint32 ibus_message_get_serial (IBusMessage *messag e);
			/**
			* ibus_message_append_args:
			* @message: An IBusMessage.
			* @first_arg_type: Type of the first argument.
			* @...: Rest of arguments.
			* @returns: %TRUE if succeed; %FALSE otherwise.
			*
			* Appends fields to a message given a variable argument list.
			*
			* The variable argument list should contain the type of each argument foll
			owed by the value to append.
			* Appendable types are basic types, and arrays of fixed-length basic types
			.
			* To append variable-length basic types, or any more complex value,
			* you have to use an iterator rather than this function.
			*
			* To append a basic type, specify its type code followed by the address of
			the value. For example:
			* <informalexample>
			* <programlisting>
			* dbus_int32_t v_INT32 = 42;
			* const char *v_STRING = "Hello World";
			* dbus_message_append_args (message,
			* DBUS_TYPE_INT32, &v_INT32,
			* DBUS_TYPE_STRING, &v_STRING,
			* DBUS_TYPE_INVALID);
			* </programlisting>
			* </informalexample>
			*
			* To append an array of fixed-length basic types, pass in the %DBUS_TYPE_A
			RRAY typecode,
			* the element typecode, the address of the array pointer,
			* and a 32-bit integer giving the number of elements in the array. So for
			example:
			* <informalexample>
			* <programlisting>
			* const dbus_int32_t array[] = { 1, 2, 3 };
			* const dbus_int32_t *v_ARRAY = array;
			* dbus_message_append_args (message,
			* DBUS_TYPE_ARRAY, DBUS_TYPE_INT32, &v_ARRAY, 3,
			* DBUS_TYPE_INVALID);
			* </programlisting>
			* </informalexample>
			*
			*
			* <note><para>
			* in C, given "int array[]", "&array == array" (the comp.lang.c FAQ says o
			therwise, but gcc and the FAQ don't agree).
			* So if you're using an array instead of a pointer you have to create a po
			inter variable,
			* assign the array to it, then take the address of the pointer variable.
			* For strings it works to write const char *array = "Hello" and then use &
			amp;array though.
			* </para></note>
			*
			* The last argument to this function must be %DBUS_TYPE_INVALID, marking t
			he end of the argument list.
			* If you don't do this then libdbus won't know to stop and will read inval
			id memory.
			*
			* String/signature/path arrays should be passed in as "const char*** addre
			ss_of_array" and "int n_elements"
			*
			* @see_also: ibus_message_append_args_valist().
			*/
	gboolean ibus_message_append_args (IBusMessage *messag e,		gboolean ibus_message_append_args (IBusMessage *messag e,
	GType first_ arg_type,		GType first_ arg_type,
	...);		...);
			/**
			* ibus_message_append_args_valist:
			* @message: An IBusMessage.
			* @first_arg_type: Type of the first argument.
			* @va_args: Rest of arguments.
			* @returns: %TRUE if succeed; %FALSE otherwise.
			* @see_also: ibus_message_append_args().
			*
			* Like ibus_message_append_args() but takes a va_list for use by language
			bindings.
			*/
	gboolean ibus_message_append_args_valist(IBusMessage *messag e,		gboolean ibus_message_append_args_valist(IBusMessage *messag e,
	GType first_ arg_type,		GType first_ arg_type,
	va_list va_arg s);		va_list va_arg s);
			/**
			* ibus_message_get_args:
			* @message: An IBusMessage.
			* @error: Error to be filled in on failure.
			* @first_arg_type: Type of the first argument.
			* @...: Rest of arguments.
			* @returns: %TRUE if succeed; F%ALSE otherwise.
			*
			* Gets arguments from a message given a variable argument list.
			*
			* The supported types include those supported by ibus_message_append_args(
			);
			* that is, basic types and arrays of fixed-length basic types.
			* The arguments are the same as they would be for ibus_message_iter_get_ba
			sic()
			* or ibus_message_iter_get_fixed_array().
			*
			* In addition to those types, arrays of string, object path, and signature
			are supported;
			* but these are returned as allocated memory and must be freed with dbus_f
			ree_string_array(),
			* while the other types are returned as const references.
			* To get a string array pass in "char ***array_location" and "int *n_eleme
			nts".
			*
			* The variable argument list should contain the type of the argument follo
			wed by a pointer to
			* where the value should be stored. The list is terminated with %DBUS_TYPE
			_INVALID.
			*
			* Except for string arrays, the returned values are constant; do not free
			them.
			* They point into the IBusMessage.
			*
			* If the requested arguments are not present, or do not have the requested
			types, then an error will be set.
			*
			* If more arguments than requested are present,
			* the requested arguments are returned and the extra arguments are ignored
			.
			*
			* @see_also: ibus_message_append_args(), ibus_message_get_args_valist().
			*/
	gboolean ibus_message_get_args (IBusMessage *messag e,		gboolean ibus_message_get_args (IBusMessage *messag e,
	IBusError **error ,		IBusError **error ,
	GType first_ arg_type,		GType first_ arg_type,
	...);		...);
			/**
			* ibus_message_append_args_valist:
			* @message: An IBusMessage.
			* @first_arg_type: Type of the first argument.
			* @va_args: Rest of arguments.
			* @returns: %TRUE if succeed; %FALSE otherwise.
			*
			* Like ibus_message_get_args but takes a va_list for use by language bindi
			ngs.
			*
			* @see_also: ibus_message_append_args_valist(), ibus_message_get_args().
			*/
	gboolean ibus_message_get_args_valist (IBusMessage *messag e,		gboolean ibus_message_get_args_valist (IBusMessage *messag e,
	IBusError **error ,		IBusError **error ,
	GType first_ arg_type,		GType first_ arg_type,
	va_list va_arg s);		va_list va_arg s);
			/**
			* ibus_message_iter_init_append:
			* @message: An IBusMessage.
			* @iter: An IBusMessageIter to to initialize.
			*
			* Initializes a #IBusMessageIter for appending arguments to the end of a m
			essage.
			*/
	void ibus_message_iter_init_append (IBusMessage *messag e,		void ibus_message_iter_init_append (IBusMessage *messag e,
	IBusMessageIter *iter);		IBusMessageIter *iter);
			/**
			* ibus_message_iter_append:
			* @iter: An IBusMessageIter.
			* @type: The type of the value.
			* @value: The pointer to the value.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Appends a basic-typed value to the message.
			*
			* The basic types are the non-container types such as integer and string.
			*
			* The "value" argument should be the address of a basic-typed value.
			* So for string, const char**. For integer, dbus_int32_t*.
			*/
	gboolean ibus_message_iter_append (IBusMessageIter *iter,		gboolean ibus_message_iter_append (IBusMessageIter *iter,
	GType type,		GType type,
	gconstpointer value) ;		gconstpointer value) ;
			gboolean ibus_message_iter_copy_data (IBusMessageIter *dst,
			IBusMessageIter *src);
			/**
			* ibus_message_iter_init:
			* @message: An IBusMessage.
			* @iter: An IBusMessageIter.
			* @returns: %TRUE if succeed; %FALSE if the message has no arguments.
			*
			* Initializes an #IBusMessageIter for reading the arguments of the message
			passed in.
			*
			* When possible, ibus_message_get_args() is much more convenient.
			* Some types of argument can only be read with IBusMessageIter however.
			*
			* The easiest way to iterate is like this:
			* <informalexample>
			* <programlisting>
			* dbus_message_iter_init (&iter);
			* while ((current_type = dbus_message_iter_get_arg_type (&iter)) != DB
			US_TYPE_INVALID)
			* dbus_message_iter_next (&iter);
			* </programlisting>
			* </informalexample>
			*
			* IBusMessageIter contains no allocated memory;
			* it need not be freed, and can be copied by assignment or memcpy().
			*/
	gboolean ibus_message_iter_init (IBusMessage *messag e,		gboolean ibus_message_iter_init (IBusMessage *messag e,
	IBusMessageIter *iter);		IBusMessageIter *iter);
	gboolean ibus_message_iter_peek (IBusMessageIter *iter,
	GType type,		/**
	gpointer value)		* ibus_message_iter_get_basic:
	;		* @iter: An IBusMessageIter.
			* @value: Result value stores here. Cannot be %NULL.
			*
			* Reads a basic-typed value from the message iterator.
			*
			* Basic types are the non-containers such as integer and string.
			*
			* The value argument should be the address of a location to store the retu
			rned value.
			* So for int32 it should be a "dbus_int32_t*" and for string a "const char
			**".
			* The returned value is by reference and should not be freed.
			*
			* Be sure you have somehow checked that dbus_message_iter_get_arg_type() m
			atches the type you are expecting,
			* or you'll crash when you try to use an integer as a string or something.
			*
			* To read any container type (array, struct, dict) you will need to recurs
			e into the container with
			* dbus_message_iter_recurse().
			* If the container is an array of fixed-length values,
			* you can get all the array elements at once with dbus_message_iter_get_fi
			xed_array().
			* Otherwise, you have to iterate over the container's contents one value a
			t a time.
			*
			* All basic-typed values are guaranteed to fit in 8 bytes. So you can writ
			e code like this:
			* <informalexample>
			* <programlisting>
			* dbus_uint64_t value;
			* int type;
			* dbus_message_iter_get_basic (&read_iter, &value);
			* type = dbus_message_iter_get_arg_type (&read_iter);
			* dbus_message_iter_append_basic (&write_iter, type, &value);
			* </programlisting>
			* </informalexample>
			*
			* On some really obscure platforms dbus_uint64_t might not exist,
			* if you need to worry about this you will know.
			* dbus_uint64_t is just one example of a type that's large enough to hold
			any possible value,
			* you could use a struct or char[8] instead if you like.
			*/
	void ibus_message_iter_get_basic (IBusMessageIter *iter,		void ibus_message_iter_get_basic (IBusMessageIter *iter,
	gpointer value) ;		gpointer value) ;
			/**
			* ibus_message_iter_get:
			* @iter: An IBusMessageIter.
			* @type: The type of the value. Cannot be %NULL.
			* @value: Result value stores here. Cannot be %NULL.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Gets an value from an IBusMessageIter, then move on to the next element.
			*
			*/
	gboolean ibus_message_iter_get (IBusMessageIter *iter,		gboolean ibus_message_iter_get (IBusMessageIter *iter,
	GType type,		GType type,
	gpointer value) ;		gpointer value) ;
			/**
			* ibus_message_iter_next:
			* @iter: An IBusMessageIter.
			* @returns: %TRUE if the iterator moves forward successfully; %FALSE if ne
			xt element does not exist.
			*
			* Moves the iterator to the next field, if any.
			*
			* If there's no next field, returns %FALSE. If the iterator moves forward,
			returns %TRUE.
			*/
	gboolean ibus_message_iter_next (IBusMessageIter *iter);		gboolean ibus_message_iter_next (IBusMessageIter *iter);
			/**
			* ibus_message_iter_has_next:
			* @iter: An IBusMessageIter.
			* @returns: %TRUE if next element exists; %FALSE otherwise.
			*
			* Checks if an iterator has any more fields.
			*/
	gboolean ibus_message_iter_has_next (IBusMessageIter *iter);		gboolean ibus_message_iter_has_next (IBusMessageIter *iter);
			/**
			* ibus_message_iter_open_container:
			* @iter: An IBusMessageIter.
			* @type: The type of the value.
			* @contained_signature: The type of container contents.
			* @sub: Sub-iterator to initialize.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Appends a container-typed value to the message;
			* you are required to append the contents of the container using the retur
			ned sub-iterator,
			* and then call dbus_message_iter_close_container().
			*
			* Container types are for example struct, variant, and array.
			* For variants, the contained_signature should be the type of the single v
			alue inside the variant.
			* For structs and dict entries, contained_signature should be %NULL;
			* it will be set to whatever types you write into the struct.
			* For arrays, contained_signature should be the type of the array elements
			.
			*/
	gboolean ibus_message_iter_open_container		gboolean ibus_message_iter_open_container
	(IBusMessageIter *iter,		(IBusMessageIter *iter,
	GType type,		GType type,
	const gchar *contai ned_signature,		const gchar *contai ned_signature,
	IBusMessageIter *sub);		IBusMessageIter *sub);
			/**
			* ibus_message_iter_close_container:
			* @iter: An IBusMessageIter.
			* @sub: Sub-iterator to close.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Closes a container-typed value appended to the message;
			* may write out more information to the message known only after the entir
			e container is written,
			* and may free resources created by dbus_message_iter_open_container().
			*/
	gboolean ibus_message_iter_close_container		gboolean ibus_message_iter_close_container
	(IBusMessageIter *iter,		(IBusMessageIter *iter,
	IBusMessageIter *sub);		IBusMessageIter *sub);
			/**
			* ibus_message_iter_recurse:
			* @iter: An IBusMessageIter.
			* @type: The type of the value.
			* @sub: Sub-iterator to initialize.
			* @returns: %TRUE if succeed; %FALSE if insufficient memory.
			*
			* Recurses into a container value when reading values from a message,
			* initializing a sub-iterator to use for traversing the child values of th
			e container.
			*
			* Note that this recurses into a value, not a type, so you can only recurs
			e if the value exists.
			* The main implication of this is that if you have for example an empty ar
			ray of array of int32,
			* you can recurse into the outermost array, but it will have no values, so
			you won't be able to recurse further.
			* There's no array of int32 to recurse into.
			*
			* If a container is an array of fixed-length types, it is much more effici
			ent to use
			* dbus_message_iter_get_fixed_array() to get the whole array in one shot,
			* rather than individually walking over the array elements.
			*
			* Be sure you have somehow checked that dbus_message_iter_get_arg_type()
			* matches the type you are expecting to recurse into.
			* Results of this function are undefined if there is no container to recur
			se into at the current iterator position.
			*/
	gboolean ibus_message_iter_recurse (IBusMessageIter *iter,		gboolean ibus_message_iter_recurse (IBusMessageIter *iter,
	GType type,		GType type,
	IBusMessageIter *sub);		IBusMessageIter *sub);
			/**
			* ibus_message_iter_get_arg_type:
			* @iter: An IBusMessageIter.
			* @returns: The argument type.
			*
			* Returns the argument type of the argument that the message iterator poin
			ts to.
			*
			* If the iterator is at the end of the message, returns %DBUS_TYPE_INVALID
			.
			* You can thus write a loop as follows:
			* <informalexample>
			* <programlisting>
			* dbus_message_iter_init (&iter);
			* while ((current_type = dbus_message_iter_get_arg_type (&iter)) != DB
			US_TYPE_INVALID)
			* dbus_message_iter_next (&iter);
			* </programlisting>
			* </informalexample>
			*/
	GType ibus_message_iter_get_arg_type (IBusMessageIter *iter);		GType ibus_message_iter_get_arg_type (IBusMessageIter *iter);
			/**
			* ibus_message_iter_get_element_type:
			* @iter: An IBusMessageIter.
			* @returns: The argument type.
			*
			* Returns the element type of the array that the message iterator points t
			o.
			* Note that you need to check that the iterator points to an array prior t
			o using this function.
			*/
	GType ibus_message_iter_get_element_type		GType ibus_message_iter_get_element_type
	(IBusMessageIter *iter);		(IBusMessageIter *iter);
			/**
			* ibus_message_to_string:
			* @message: An IBusMessage.
			* @returns: A string which shows the information of the message.
			*
			* Produces a pretty formatted string which show the information of the IBu
			sMessage.
			* This string is suitable for debugging information print out.
			*
			* Free the string by g_free() after use.
			*/
	gchar *ibus_message_to_string (IBusMessage *message);		gchar *ibus_message_to_string (IBusMessage *message);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 60 change blocks.
	4 lines changed or deleted		894 lines changed or added

	ibusshare.h		ibusshare.h
	skipping to change at line 48		skipping to change at line 48
	#define IBUS_INTERFACE_INPUT_CONTEXT \		#define IBUS_INTERFACE_INPUT_CONTEXT \
	"org.freedesktop.IBus.InputContext"		"org.freedesktop.IBus.InputContext"
	#define IBUS_INTERFACE_FACTORY "org.freedesktop.IBus.Factory"		#define IBUS_INTERFACE_FACTORY "org.freedesktop.IBus.Factory"
	#define IBUS_INTERFACE_ENGINE "org.freedesktop.IBus.Engine"		#define IBUS_INTERFACE_ENGINE "org.freedesktop.IBus.Engine"
	#define IBUS_INTERFACE_PANEL "org.freedesktop.IBus.Panel"		#define IBUS_INTERFACE_PANEL "org.freedesktop.IBus.Panel"
	#define IBUS_INTERFACE_CONFIG "org.freedesktop.IBus.Config"		#define IBUS_INTERFACE_CONFIG "org.freedesktop.IBus.Config"
	#define IBUS_INTERFACE_NOTIFICATIONS "org.freedesktop.IBus.Notifications "		#define IBUS_INTERFACE_NOTIFICATIONS "org.freedesktop.IBus.Notifications "
	G_BEGIN_DECLS		G_BEGIN_DECLS
			const gchar *ibus_get_local_machine_id
			(void);
	void ibus_set_display (const gchar *display);		void ibus_set_display (const gchar *display);
	const gchar *ibus_get_address (void);		const gchar *ibus_get_address (void);
			void ibus_write_address (const gchar *address);
	const gchar *ibus_get_user_name (void);		const gchar *ibus_get_user_name (void);
	glong ibus_get_daemon_uid (void);		glong ibus_get_daemon_uid (void);
	const gchar *ibus_get_socket_path (void);		const gchar *ibus_get_socket_path (void);
	const gchar *ibus_get_socket_folder (void);		const gchar *ibus_get_socket_folder (void);
	const gchar *ibus_keyval_name (guint keyval);		const gchar *ibus_keyval_name (guint keyval);
	guint ibus_keyval_from_name (const gchar *keyval_name);		guint ibus_keyval_from_name (const gchar *keyval_name);
	void ibus_free_strv (gchar **strv);		void ibus_free_strv (gchar **strv);
	const gchar *ibus_key_event_to_string		const gchar *ibus_key_event_to_string
	(guint keyval,		(guint keyval,
End of changes. 2 change blocks.
	0 lines changed or deleted		3 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/