ibusbus.h   ibusbus.h 
skipping to change at line 205 skipping to change at line 205
* @client_name: Name of client. * @client_name: Name of client.
* @returns: An newly allocated IBusInputContext if the "CreateInputContext " call * @returns: An newly allocated IBusInputContext if the "CreateInputContext " call
* is suceeded, NULL otherwise. * is suceeded, NULL otherwise.
* *
* Create an input context for client. * Create an input context for client.
*/ */
IBusInputContext IBusInputContext
*ibus_bus_create_input_context *ibus_bus_create_input_context
(IBusBus *bus, (IBusBus *bus,
const gchar *client_name); const gchar *client_name);
/**
* ibus_bus_current_input_context:
* @bus: An IBusBus.
* @returns: The named of currently focued IBusInputContext if the "Current
InputContext" call
* suceeded, NULL otherwise.
*
* Get the current focused input context.
*/
const gchar *ibus_bus_current_input_context(IBusBus *bus);
/** /**
* ibus_bus_register_component: * ibus_bus_register_component:
* @bus: An IBusBus. * @bus: An IBusBus.
* @component: A input engine component. * @component: A input engine component.
* @returns: TRUE if the "RegisterComponent" call is suceeded, FALSE otherw ise. * @returns: TRUE if the "RegisterComponent" call is suceeded, FALSE otherw ise.
* *
* Register a componet to an IBusBus. * Register a componet to an IBusBus.
*/ */
gboolean ibus_bus_register_component(IBusBus *bus, gboolean ibus_bus_register_component(IBusBus *bus,
IBusComponent *component); IBusComponent *component);
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added


 ibusconfig.h   ibusconfig.h 
skipping to change at line 58 skipping to change at line 58
#define IBUS_IS_CONFIG_CLASS(klass) \ #define IBUS_IS_CONFIG_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_CONFIG)) (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_CONFIG))
#define IBUS_CONFIG_GET_CLASS(obj) \ #define IBUS_CONFIG_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_CONFIG, IBusConfigClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_CONFIG, IBusConfigClass))
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _IBusConfig IBusConfig; typedef struct _IBusConfig IBusConfig;
typedef struct _IBusConfigClass IBusConfigClass; typedef struct _IBusConfigClass IBusConfigClass;
/**
* IBusConfig:
*
* An opaque data type representing an IBusConfig.
*/
struct _IBusConfig { struct _IBusConfig {
IBusProxy parent; IBusProxy parent;
/* instance members */ /* instance members */
}; };
struct _IBusConfigClass { struct _IBusConfigClass {
IBusProxyClass parent; IBusProxyClass parent;
/* class members */ /* class members */
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 ibusenumtypes.h   ibusenumtypes.h 
/* Generated data (by glib-mkenums) */ /* Generated data (by glib-mkenums) */
/**
* SECTION: ibusenumtypes
* @short_description: Enumeration definition in IBus.
* @stability: Stable
*
* IBusEnumTypes lists IBus enumeration types.
*/
#ifndef __IBUS_ENUM_TYPES_H__ #ifndef __IBUS_ENUM_TYPES_H__
#define __IBUS_ENUM_TYPES_H__ #define __IBUS_ENUM_TYPES_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* enumerations from "ibusobject.h" */ /* enumerations from "ibusobject.h" */
/**
* ibus_object_flags_get_type:
* @returns: GType of IBUS_OBJECT_FLAGS
*
* Returns the type of IBUS_OBJECT_FLAGS as GType.
*/
GType ibus_object_flags_get_type (void) G_GNUC_CONST; GType ibus_object_flags_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_OBJECT_FLAGS:
* @returns: GType of IBUS_OBJECT_FLAGS
*
* Returns the type of IBUS_OBJECT_FLAGS as GType.
*/
#define IBUS_TYPE_OBJECT_FLAGS (ibus_object_flags_get_type ()) #define IBUS_TYPE_OBJECT_FLAGS (ibus_object_flags_get_type ())
/* enumerations from "ibusattribute.h" */ /* enumerations from "ibusattribute.h" */
/**
* ibus_attr_type_get_type:
* @returns: GType of IBUS_ATTR_TYPE
*
* Returns the type of IBUS_ATTR_TYPE as GType.
*/
GType ibus_attr_type_get_type (void) G_GNUC_CONST; GType ibus_attr_type_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_ATTR_TYPE:
* @returns: GType of IBUS_ATTR_TYPE
*
* Returns the type of IBUS_ATTR_TYPE as GType.
*/
#define IBUS_TYPE_ATTR_TYPE (ibus_attr_type_get_type ()) #define IBUS_TYPE_ATTR_TYPE (ibus_attr_type_get_type ())
/**
* ibus_attr_underline_get_type:
* @returns: GType of IBUS_ATTR_UNDERLINE
*
* Returns the type of IBUS_ATTR_UNDERLINE as GType.
*/
GType ibus_attr_underline_get_type (void) G_GNUC_CONST; GType ibus_attr_underline_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_ATTR_UNDERLINE:
* @returns: GType of IBUS_ATTR_UNDERLINE
*
* Returns the type of IBUS_ATTR_UNDERLINE as GType.
*/
#define IBUS_TYPE_ATTR_UNDERLINE (ibus_attr_underline_get_type ()) #define IBUS_TYPE_ATTR_UNDERLINE (ibus_attr_underline_get_type ())
/* enumerations from "ibusproperty.h" */ /* enumerations from "ibusproperty.h" */
/**
* ibus_prop_type_get_type:
* @returns: GType of IBUS_PROP_TYPE
*
* Returns the type of IBUS_PROP_TYPE as GType.
*/
GType ibus_prop_type_get_type (void) G_GNUC_CONST; GType ibus_prop_type_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_PROP_TYPE:
* @returns: GType of IBUS_PROP_TYPE
*
* Returns the type of IBUS_PROP_TYPE as GType.
*/
#define IBUS_TYPE_PROP_TYPE (ibus_prop_type_get_type ()) #define IBUS_TYPE_PROP_TYPE (ibus_prop_type_get_type ())
/**
* ibus_prop_state_get_type:
* @returns: GType of IBUS_PROP_STATE
*
* Returns the type of IBUS_PROP_STATE as GType.
*/
GType ibus_prop_state_get_type (void) G_GNUC_CONST; GType ibus_prop_state_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_PROP_STATE:
* @returns: GType of IBUS_PROP_STATE
*
* Returns the type of IBUS_PROP_STATE as GType.
*/
#define IBUS_TYPE_PROP_STATE (ibus_prop_state_get_type ()) #define IBUS_TYPE_PROP_STATE (ibus_prop_state_get_type ())
/* enumerations from "ibustypes.h" */ /* enumerations from "ibustypes.h" */
/**
* ibus_modifier_type_get_type:
* @returns: GType of IBUS_MODIFIER_TYPE
*
* Returns the type of IBUS_MODIFIER_TYPE as GType.
*/
GType ibus_modifier_type_get_type (void) G_GNUC_CONST; GType ibus_modifier_type_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_MODIFIER_TYPE:
* @returns: GType of IBUS_MODIFIER_TYPE
*
* Returns the type of IBUS_MODIFIER_TYPE as GType.
*/
#define IBUS_TYPE_MODIFIER_TYPE (ibus_modifier_type_get_type ()) #define IBUS_TYPE_MODIFIER_TYPE (ibus_modifier_type_get_type ())
/**
* ibus_capabilite_get_type:
* @returns: GType of IBUS_CAPABILITE
*
* Returns the type of IBUS_CAPABILITE as GType.
*/
GType ibus_capabilite_get_type (void) G_GNUC_CONST; GType ibus_capabilite_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_CAPABILITE:
* @returns: GType of IBUS_CAPABILITE
*
* Returns the type of IBUS_CAPABILITE as GType.
*/
#define IBUS_TYPE_CAPABILITE (ibus_capabilite_get_type ()) #define IBUS_TYPE_CAPABILITE (ibus_capabilite_get_type ())
/**
* ibus_orientation_get_type:
* @returns: GType of IBUS_ORIENTATION
*
* Returns the type of IBUS_ORIENTATION as GType.
*/
GType ibus_orientation_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_ORIENTATION:
* @returns: GType of IBUS_ORIENTATION
*
* Returns the type of IBUS_ORIENTATION as GType.
*/
#define IBUS_TYPE_ORIENTATION (ibus_orientation_get_type ())
G_END_DECLS G_END_DECLS
#endif /* __IBUS_ENUM_TYPES_H__ */ #endif /* __IBUS_ENUM_TYPES_H__ */
/* Generated data ends here */ /* Generated data ends here */
 End of changes. 16 change blocks. 
0 lines changed or deleted 113 lines changed or added


 ibusinputcontext.h   ibusinputcontext.h 
skipping to change at line 37 skipping to change at line 37
* which manages the context for input methods that supports * which manages the context for input methods that supports
* text input in various natural languages. * text input in various natural languages.
* *
* Clients call the IBusInputContext to invoke BusInputContext, * Clients call the IBusInputContext to invoke BusInputContext,
* through which invokes IBusEngine. * 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"
#include "ibusenginedesc.h"
/* /*
* Type macros. * Type macros.
*/ */
/* define GOBJECT macros */ /* define GOBJECT macros */
#define IBUS_TYPE_INPUT_CONTEXT \ #define IBUS_TYPE_INPUT_CONTEXT \
(ibus_input_context_get_type ()) (ibus_input_context_get_type ())
#define IBUS_INPUT_CONTEXT(obj) \ #define IBUS_INPUT_CONTEXT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_INPUT_CONTEXT, IBusInputC ontext)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_INPUT_CONTEXT, IBusInputC ontext))
skipping to change at line 93 skipping to change at line 94
* ibus_input_context_new: * ibus_input_context_new:
* @path: The path to the object that emitting the signal. * @path: The path to the object that emitting the signal.
* @connection: An IBusConnection. * @connection: An IBusConnection.
* @returns: A newly allocated IBusInputContext. * @returns: A newly allocated IBusInputContext.
* *
* New an 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_get_input_context:
* @path: The path to the object that emitting the signal.
* @connection: An IBusConnection.
* @returns: An existing IBusInputContext.
*
* Gets an existing IBusInputContext.
*/
IBusInputContext
*ibus_input_context_get_input_context
(const gchar *path,
IBusConnection *connection
);
/** /**
* ibus_input_context_process_key_event: * ibus_input_context_process_key_event:
* @context: An IBusInputContext. * @context: An IBusInputContext.
* @keyval: Key symbol of a key event. * @keyval: Key symbol of a key event.
* @keycode: Keycode of a key event. * @keycode: Keycode of a key event.
* @state: Key modifier flags. * @state: Key modifier flags.
* @returns: TRUE for successfully process the key; FALSE otherwise. * @returns: TRUE for successfully process the key; FALSE otherwise.
* *
* Pass the key event to input method engine. * Pass the key event to input method engine.
* *
skipping to change at line 208 skipping to change at line 223
/** /**
* 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:
* @context: An IBusInputContext.
* @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);
/**
* ibus_input_context_get_engine:
* @context: An IBusInputContext.
* @returns: An IME engine description for the context
*
* Returns an IME engine description for the context.
*/
IBusEngineDesc
*ibus_input_context_get_engine (IBusInputContext *context);
/**
* ibus_input_context_set_engine:
* @context: An IBusInputContext.
* @name: A name of the engine.
*
* Invoked when the IME engine is changed.
*/
void ibus_input_context_set_engine (IBusInputContext *context,
const gchar *name);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
0 lines changed or deleted 45 lines changed or added


 ibuslookuptable.h   ibuslookuptable.h 
skipping to change at line 67 skipping to change at line 67
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.
* @orientation: orientation of the table.
* @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 ... * @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 * Note that some input methods allow you to select candidate by pressing n on-numeric
* keys such as "asdfghjkl;". * keys such as "asdfghjkl;".
* Developers of these input methods should change the labels with * Developers of these input methods should change the labels with
* ibus_lookup_table_append_label(). * 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;
gint orientation;
GArray *candidates; GArray *candidates;
GArray *labels; GArray *labels;
}; };
struct _IBusLookupTableClass { struct _IBusLookupTableClass {
IBusSerializableClass parent; IBusSerializableClass parent;
}; };
GType ibus_lookup_table_get_type (void); GType ibus_lookup_table_get_type (void);
skipping to change at line 122 skipping to change at line 124
* @table: An IBusLookupTable. * @table: An IBusLookupTable.
* @text: candidate word/phrase to be appended (in IBusText format). * @text: candidate word/phrase to be appended (in IBusText format).
* *
* Append a candidate word/phrase to IBusLookupTable, and increase referenc e. * Append a candidate word/phrase to IBusLookupTable, and increase referenc e.
*/ */
void ibus_lookup_table_append_candidate void ibus_lookup_table_append_candidate
(IBusLookupTable *table, (IBusLookupTable *table,
IBusText *text); IBusText *text);
/** /**
* ibus_lookup_table_get_number_of_candidates:
* @table: An IBusLookupTable.
* @returns: The number of candidates in the table
*
* Return the number of candidate in the table.
*/
guint ibus_lookup_table_get_number_of_candidates
(IBusLookupTable *table)
;
/**
* ibus_lookup_table_get_candidate: * ibus_lookup_table_get_candidate:
* @table: An IBusLookupTable. * @table: An IBusLookupTable.
* @index: Index in the Lookup table. * @index: Index in the Lookup table.
* @returns: IBusText at the given index; NULL if no such IBusText. * @returns: IBusText at the given index; NULL if no such IBusText.
* *
* Return IBusText at the given index. Borrowed reference. * Return IBusText at the given index. Borrowed reference.
*/ */
IBusText *ibus_lookup_table_get_candidate IBusText *ibus_lookup_table_get_candidate
(IBusLookupTable *table, (IBusLookupTable *table,
guint index) ; guint index) ;
skipping to change at line 231 skipping to change at line 243
* ibus_lookup_table_get_page_size: * ibus_lookup_table_get_page_size:
* @table: An IBusLookupTable. * @table: An IBusLookupTable.
* @returns: Page size, i.e., number of candidate shown per page. * @returns: Page size, i.e., number of candidate shown per page.
* *
* Get the number of candidate shown per page. * Get the number of candidate shown per page.
*/ */
guint ibus_lookup_table_get_page_size guint ibus_lookup_table_get_page_size
(IBusLookupTable *table) ; (IBusLookupTable *table) ;
/** /**
* ibus_lookup_table_set_round:
* @table: An IBusLookupTable.
* @round: Whether to make @table round.
*
* Set whether to make the IBusLookupTable round or not.
*/
void ibus_lookup_table_set_round
(IBusLookupTable *table,
gboolean round)
;
/**
* ibus_lookup_table_is_round:
* @table: An IBusLookupTable.
* @returns: Whether the @table is round.
*
* Returns whether the IBusLookupTable is round.
*/
gboolean ibus_lookup_table_is_round (IBusLookupTable *table)
;
/**
* ibus_lookup_table_clear: * ibus_lookup_table_clear:
* @table: An IBusLookupTable. * @table: An IBusLookupTable.
* *
* Clear and remove all candidate from an IBusLookupTable. * Clear and remove all candidate from an IBusLookupTable.
*/ */
void ibus_lookup_table_clear (IBusLookupTable *table) ; void ibus_lookup_table_clear (IBusLookupTable *table) ;
/** /**
* ibus_lookup_table_page_up: * ibus_lookup_table_page_up:
* @table: An IBusLookupTable. * @table: An IBusLookupTable.
 End of changes. 4 change blocks. 
0 lines changed or deleted 34 lines changed or added


 ibusmessage.h   ibusmessage.h 
skipping to change at line 146 skipping to change at line 146
* New an IBusMessage. * New an IBusMessage.
* Valid D-Bus message types include: * Valid D-Bus message types include:
* <itemizedlist> * <itemizedlist>
* <listitem> * <listitem>
* <para>#DBUS_MESSAGE_TYPE_METHOD_CALL</para> * <para>#DBUS_MESSAGE_TYPE_METHOD_CALL</para>
* </listitem> * </listitem>
* <listitem> * <listitem>
* <para>#DBUS_MESSAGE_TYPE_METHOD_RETURN</para> * <para>#DBUS_MESSAGE_TYPE_METHOD_RETURN</para>
* </listitem> * </listitem>
* <listitem> * <listitem>
* <para>#DBUS_MESSAGE_TYPE_METHOD_ERROR</para> * <para>#DBUS_MESSAGE_TYPE_ERROR</para>
* </listitem> * </listitem>
* <listitem> * <listitem>
* <para>#DBUS_MESSAGE_TYPE_METHOD_SIGNAL</para> * <para>#DBUS_MESSAGE_TYPE_SIGNAL</para>
* </listitem> * </listitem>
* </itemizedlist> * </itemizedlist>
* These are defined in dbus-protocol.h in D-Bus. * 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: * ibus_message_ref:
* @message: An IBusMessage. * @message: An IBusMessage.
* @returns: The IBusMessage. * @returns: The IBusMessage.
skipping to change at line 555 skipping to change at line 555
/** /**
* ibus_message_get_reply_serial: * ibus_message_get_reply_serial:
* @message: An IBusMessage. * @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.
* *
* 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: * ibus_message_get_serial:
* @message: An IBusMessage. * @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.
* *
* 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 * The message's serial number is provided by the application sending the m essage
* and is used to identify replies to this message. * and is used to identify replies to this message.
* *
* All messages received on a connection will have a serial provided by the remote application. * All messages received on a connection will have a serial provided by the remote application.
* *
skipping to change at line 634 skipping to change at line 634
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: * ibus_message_append_args_valist:
* @message: An IBusMessage. * @message: An IBusMessage.
* @first_arg_type: Type of the first argument. * @first_arg_type: Type of the first argument.
* @va_args: Rest of arguments. * @va_args: Rest of arguments.
* @returns: %TRUE if succeed; %FALSE otherwise. * @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. * Like ibus_message_append_args() but takes a va_list for use by language bindings.
*
* @see_also: ibus_message_append_args().
*/ */
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: * ibus_message_get_args:
* @message: An IBusMessage. * @message: An IBusMessage.
* @error: Error to be filled in on failure. * @error: Error to be filled in on failure.
* @first_arg_type: Type of the first argument. * @first_arg_type: Type of the first argument.
skipping to change at line 681 skipping to change at line 682
* the requested arguments are returned and the extra arguments are ignored . * the requested arguments are returned and the extra arguments are ignored .
* *
* @see_also: ibus_message_append_args(), ibus_message_get_args_valist(). * @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: * ibus_message_get_args_valist:
* @message: An IBusMessage. * @message: An IBusMessage.
* @error: Error message is outputted here; or %NULL to suppress error.
* @first_arg_type: Type of the first argument. * @first_arg_type: Type of the first argument.
* @va_args: Rest of arguments. * @va_args: Rest of arguments.
* @returns: %TRUE if succeed; %FALSE otherwise. * @returns: %TRUE if succeed; %FALSE otherwise.
* *
* Like ibus_message_get_args but takes a va_list for use by language bindi ngs. * 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(). * @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 ,
skipping to change at line 723 skipping to change at line 725
* *
* The basic types are the non-container types such as integer and string. * 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. * The "value" argument should be the address of a basic-typed value.
* So for string, const char**. For integer, dbus_int32_t*. * 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) ;
/**
* ibus_message_iter_copy_data:
* @dst: Destination to be copy to.
* @src: Source to be copy from.
* @returns: %TRUE if succeed; %FALSE if failed.
*
* Deep copy an IBusMessageIter to another IBusMessageIter.
*
* Since: 1.2.0.20090719
*/
gboolean ibus_message_iter_copy_data (IBusMessageIter *dst, gboolean ibus_message_iter_copy_data (IBusMessageIter *dst,
IBusMessageIter *src); IBusMessageIter *src);
/** /**
* ibus_message_iter_init: * ibus_message_iter_init:
* @message: An IBusMessage. * @message: An IBusMessage.
* @iter: An IBusMessageIter. * @iter: An IBusMessageIter.
* @returns: %TRUE if succeed; %FALSE if the message has no arguments. * @returns: %TRUE if succeed; %FALSE if the message has no arguments.
* *
* Initializes an #IBusMessageIter for reading the arguments of the message passed in. * Initializes an #IBusMessageIter for reading the arguments of the message passed in.
 End of changes. 8 change blocks. 
5 lines changed or deleted 17 lines changed or added


 ibusproxy.h   ibusproxy.h 
skipping to change at line 64 skipping to change at line 64
#define IBUS_IS_PROXY_CLASS(klass) \ #define IBUS_IS_PROXY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_PROXY)) (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_PROXY))
#define IBUS_PROXY_GET_CLASS(obj) \ #define IBUS_PROXY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_PROXY, IBusProxyClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_PROXY, IBusProxyClass))
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _IBusProxy IBusProxy; typedef struct _IBusProxy IBusProxy;
typedef struct _IBusProxyClass IBusProxyClass; typedef struct _IBusProxyClass IBusProxyClass;
/**
* IBusProxy:
*
* An opaque data type representing an IBusProxy.
*/
struct _IBusProxy { struct _IBusProxy {
IBusObject parent; IBusObject parent;
/* instance members */ /* instance members */
}; };
struct _IBusProxyClass { struct _IBusProxyClass {
IBusObjectClass parent; IBusObjectClass parent;
/* class members */ /* class members */
gboolean (* ibus_signal) (IBusProxy *proxy, gboolean (* ibus_signal) (IBusProxy *proxy,
skipping to change at line 178 skipping to change at line 183
*/ */
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,
...); ...);
/** /**
* ibus_proxy_send_with reply: * ibus_proxy_send_with_reply:
* @proxy: An IBusProxy. * @proxy: An IBusProxy.
* @message: The IBusMessage to be sent. * @message: The IBusMessage to be sent.
* @pending: Return location of a IBusPendingCall object, or NULL if connec
tion is disconnected.
* @timeout_milliseconds: Time out in milliseconds.
* @returns: TRUE if succeed; FALSE otherwise. * @returns: TRUE if succeed; FALSE otherwise.
* *
* Send an IBusMessage to the corresponding service and returns * Send an IBusMessage to the corresponding service and returns
* an IBusPendingCall used to receive a reply to the message. * an IBusPendingCall used to receive a reply to the message.
* This function calls ibus_connection_send_with_reply() to do the actual s ending. * This function calls ibus_connection_send_with_reply() to do the actual s ending.
* *
* @see_also: ibus_connection_send_with_reply(), * @see_also: ibus_connection_send_with_reply(),
* @see_also: ibus_proxy_send(), ibus_proxy_call_with_reply(), ibus_proxy_s end_with_reply_and_block(). * @see_also: ibus_proxy_send(), ibus_proxy_call_with_reply(), ibus_proxy_s end_with_reply_and_block().
*/ */
gboolean ibus_proxy_send_with_reply (IBusProxy *proxy, gboolean ibus_proxy_send_with_reply (IBusProxy *proxy,
skipping to change at line 242 skipping to change at line 249
/** /**
* ibus_proxy_get_name: * ibus_proxy_get_name:
* @proxy: An IBusProxy. * @proxy: An IBusProxy.
* @returns: The service name of the proxy object. * @returns: The service name of the proxy object.
* *
* Get the service name of a proxy object. * Get the service name of a proxy object.
*/ */
const gchar *ibus_proxy_get_name (IBusProxy *proxy); const gchar *ibus_proxy_get_name (IBusProxy *proxy);
/** /**
* ibus_proxy_get_name: * ibus_proxy_get_unique_name:
* @proxy: An IBusProxy. * @proxy: An IBusProxy.
* @returns: The service name of the proxy object. * @returns: The service name of the proxy object.
* *
* Get the unique name of the proxy object. * Get the unique name of the proxy object.
*/ */
const gchar *ibus_proxy_get_unique_name (IBusProxy *proxy); const gchar *ibus_proxy_get_unique_name (IBusProxy *proxy);
/** /**
* ibus_proxy_get_path: * ibus_proxy_get_path:
* @proxy: An IBusProxy. * @proxy: An IBusProxy.
 End of changes. 4 change blocks. 
2 lines changed or deleted 10 lines changed or added


 ibusservice.h   ibusservice.h 
skipping to change at line 137 skipping to change at line 137
* @connection: Corresponding IBusCOnnection * @connection: Corresponding IBusCOnnection
* @returns: TRUE if succeed; FALSE otherwise. * @returns: TRUE if succeed; FALSE otherwise.
* *
* Add an IBus Service to an IBusConnection. * Add an IBus Service to an IBusConnection.
* This function also connects the service to the signal IBusConnection::de stroy of the connection. * This function also connects the service to the signal IBusConnection::de stroy of the connection.
*/ */
gboolean ibus_service_add_to_connection (IBusService *service, gboolean ibus_service_add_to_connection (IBusService *service,
IBusConnection *connection ); IBusConnection *connection );
/** /**
* ibus_service_add_to_connection: * ibus_service_get_connections:
* @service: An IBusService. * @service: An IBusService.
* @connection: Corresponding IBusCOnnection * @returns: A newly allocated list of connections.
* @returns: TRUE if succeed; FALSE otherwise.
* *
* Add an IBusService to an IBusConnection. * Returns a copy of list of connections.
* This function also connects the service to the signal IBusConnection::de * List elements need to be unref by g_object_unref().
stroy of the connection.
*/ */
GList *ibus_service_get_connections (IBusService *service); GList *ibus_service_get_connections (IBusService *service);
/** /**
* ibus_service_remove_from_connection: * ibus_service_remove_from_connection:
* @service: An IBusService. * @service: An IBusService.
* @connection: Corresponding IBusCOnnection * @connection: Corresponding IBusCOnnection
* @returns: TRUE if succeed; FALSE otherwise. * @returns: TRUE if succeed; FALSE otherwise.
* *
* Remove an IBusService from an IBusConnection. * Remove an IBusService from an IBusConnection.
 End of changes. 3 change blocks. 
6 lines changed or deleted 4 lines changed or added


 ibusshare.h   ibusshare.h 
skipping to change at line 21 skipping to change at line 21
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * 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: ibusshare
* @short_description: Shared utility functions and definition.
* @stability: Stable
*
* This file defines some utility functions and definition
* which are shared among ibus component and services.
*/
#ifndef __IBUS_SHARE_H_ #ifndef __IBUS_SHARE_H_
#define __IBUS_SHARE_H_ #define __IBUS_SHARE_H_
#include <glib.h> #include <glib.h>
/**
* IBUS_SERVICE_IBUS:
*
* Address of IBus service.
*/
#define IBUS_SERVICE_IBUS "org.freedesktop.IBus" #define IBUS_SERVICE_IBUS "org.freedesktop.IBus"
/**
* IBUS_SERVICE_PANEL:
*
* Address of IBus panel service.
*/
#define IBUS_SERVICE_PANEL "org.freedesktop.IBus.Panel" #define IBUS_SERVICE_PANEL "org.freedesktop.IBus.Panel"
/**
* IBUS_SERVICE_CONFIG:
*
* Address of IBus config service.
*/
#define IBUS_SERVICE_CONFIG "org.freedesktop.IBus.Config" #define IBUS_SERVICE_CONFIG "org.freedesktop.IBus.Config"
/**
* IBUS_SERVICE_NOTIFICATIONS:
*
* Address of IBus notification service.
*/
#define IBUS_SERVICE_NOTIFICATIONS "org.freedesktop.IBus.Notifications" #define IBUS_SERVICE_NOTIFICATIONS "org.freedesktop.IBus.Notifications"
/**
* IBUS_PATH_IBUS:
*
* D-Bus path for IBus
*/
#define IBUS_PATH_IBUS "/org/freedesktop/IBus" #define IBUS_PATH_IBUS "/org/freedesktop/IBus"
/**
* IBUS_PATH_FACTORY:
*
* D-Bus path for IBus factory.
*/
#define IBUS_PATH_FACTORY "/org/freedesktop/IBus/Factory" #define IBUS_PATH_FACTORY "/org/freedesktop/IBus/Factory"
/**
* IBUS_PATH_PANEL:
*
* D-Bus path for IBus panel.
*/
#define IBUS_PATH_PANEL "/org/freedesktop/IBus/Panel" #define IBUS_PATH_PANEL "/org/freedesktop/IBus/Panel"
/**
* IBUS_PATH_CONFIG:
*
* D-Bus path for IBus config.
*/
#define IBUS_PATH_CONFIG "/org/freedesktop/IBus/Config" #define IBUS_PATH_CONFIG "/org/freedesktop/IBus/Config"
/**
* IBUS_PATH_NOTIFICATIONS:
*
* D-Bus path for IBus notifications.
*/
#define IBUS_PATH_NOTIFICATIONS "/org/freedesktop/IBus/Notifications" #define IBUS_PATH_NOTIFICATIONS "/org/freedesktop/IBus/Notifications"
/**
* IBUS_PATH_INPUT_CONTEXT:
*
* Template of D-Bus path for IBus input context.
*/
#define IBUS_PATH_INPUT_CONTEXT "/org/freedesktop/IBus/InputContext_%d" #define IBUS_PATH_INPUT_CONTEXT "/org/freedesktop/IBus/InputContext_%d"
/**
* IBUS_INTERFACE_IBUS:
*
* D-Bus interface for IBus.
*/
#define IBUS_INTERFACE_IBUS "org.freedesktop.IBus" #define IBUS_INTERFACE_IBUS "org.freedesktop.IBus"
/**
* IBUS_INTERFACE_INPUT_CONTEXT:
*
* D-Bus interface for IBus input context.
*/
#define IBUS_INTERFACE_INPUT_CONTEXT \ #define IBUS_INTERFACE_INPUT_CONTEXT \
"org.freedesktop.IBus.InputContext" "org.freedesktop.IBus.InputContext"
/**
* IBUS_INTERFACE_FACTORY:
*
* D-Bus interface for IBus factory.
*/
#define IBUS_INTERFACE_FACTORY "org.freedesktop.IBus.Factory" #define IBUS_INTERFACE_FACTORY "org.freedesktop.IBus.Factory"
/**
* IBUS_INTERFACE_ENGINE:
*
* D-Bus interface for IBus engine.
*/
#define IBUS_INTERFACE_ENGINE "org.freedesktop.IBus.Engine" #define IBUS_INTERFACE_ENGINE "org.freedesktop.IBus.Engine"
/**
* IBUS_INTERFACE_PANEL:
*
* D-Bus interface for IBus panel.
*/
#define IBUS_INTERFACE_PANEL "org.freedesktop.IBus.Panel" #define IBUS_INTERFACE_PANEL "org.freedesktop.IBus.Panel"
/**
* IBUS_INTERFACE_CONFIG:
*
* D-Bus interface for IBus config.
*/
#define IBUS_INTERFACE_CONFIG "org.freedesktop.IBus.Config" #define IBUS_INTERFACE_CONFIG "org.freedesktop.IBus.Config"
/**
* IBUS_INTERFACE_NOTIFICATIONS:
*
* D-Bus interface for IBus notifications.
*/
#define IBUS_INTERFACE_NOTIFICATIONS "org.freedesktop.IBus.Notifications " #define IBUS_INTERFACE_NOTIFICATIONS "org.freedesktop.IBus.Notifications "
G_BEGIN_DECLS G_BEGIN_DECLS
/**
* ibus_get_local_machine_id:
* @returns: A newly allocated string that shows the UUID of the machine.
*
* Obtains the machine UUID of the machine this process is running on.
*/
const gchar *ibus_get_local_machine_id const gchar *ibus_get_local_machine_id
(void); (void);
/**
* ibus_set_display:
* @display: Display address, as in DISPLAY environment for X.
*
* Set the display address.
*/
void ibus_set_display (const gchar *display); void ibus_set_display (const gchar *display);
/**
* ibus_get_address:
* @returns: D-Bus address of IBus. %NULL for not found.
*
* Return the D-Bus address of IBus.
* It will find the address from following source:
* <orderedlist>
* <listitem><para>Environment variable IBUS_ADDRESS</para></listitem>
* <listitem><para>Socket file under ~/.config/ibus/bus/</para></listite
m>
* </orderedlist>
*
* @see_also: ibus_write_address().
*/
const gchar *ibus_get_address (void); const gchar *ibus_get_address (void);
/**
* ibus_write_address:
* @address: D-Bus address of IBus.
*
* Write D-Bus address to socket file.
*
* @see_also: ibus_get_address().
*/
void ibus_write_address (const gchar *address); void ibus_write_address (const gchar *address);
/**
* ibus_get_user_name:
* @returns: A newly allocated string that stores current user name.
*
* Get the current user name.
* It is determined by:
* <orderedlist>
* <listitem><para>getlogin()</para></listitem>
* <listitem><para>Environment variable SUDO_USER</para></listitem>
* <listitem><para>Environment variable USERHELPER_UID</para></listitem>
* <listitem><para>Environment variable USERNAME</para></listitem>
* <listitem><para>Environment variable LOGNAME</para></listitem>
* <listitem><para>Environment variable USER</para></listitem>
* <listitem><para>Environment variable LNAME</para></listitem>
* </orderedlist>
*/
const gchar *ibus_get_user_name (void); const gchar *ibus_get_user_name (void);
/**
* ibus_get_daemon_uid:
* @returns: UID of ibus-daemon; or 0 if UID is not available.
*
* Get UID of ibus-daemon.
*/
glong ibus_get_daemon_uid (void); glong ibus_get_daemon_uid (void);
/**
* ibus_get_socket_path:
* @returns: A newly allocated string that stores the path of socket file.
*
* Get the path of socket file.
*/
const gchar *ibus_get_socket_path (void); const gchar *ibus_get_socket_path (void);
/**
* ibus_keyval_name:
* @keyval: Key symbol.
* @returns: Corresponding key name. %NULL if no such key symbol.
*
* Return the name of a key symbol.
*
* Note that the returned string is used internally, so don't free it.
*/
const gchar *ibus_keyval_name (guint keyval); const gchar *ibus_keyval_name (guint keyval);
/**
* ibus_keyval_from_name:
* @keyval_name: Key name in #gdk_keys_by_name.
* @returns: Corresponding key symbol.
*
* Return the key symbol that associate with the key name.
*/
guint ibus_keyval_from_name (const gchar *keyval_name); guint ibus_keyval_from_name (const gchar *keyval_name);
/**
* ibus_free_strv:
* @strv: List of strings.
*
* Free a list of strings.
*/
void ibus_free_strv (gchar **strv); void ibus_free_strv (gchar **strv);
/**
* ibus_key_event_to_string:
* @keyval: Key symbol.
* @modifiers: Modifiers such as Ctrl or Shift.
* @returns: The name of a key symbol and modifier.
*
* Return the name of a key symbol and modifiers.
*
* For example, if press ctrl, shift, and enter, then this function returns
:
* Shift+Control+enter.
*/
const gchar *ibus_key_event_to_string const gchar *ibus_key_event_to_string
(guint keyval, (guint keyval,
guint modifiers); guint modifiers);
/**
* ibus_key_event_from_string:
* @string: Key event string.
* @keyval: Variable that hold key symbol result.
* @modifiers: Variable that hold modifiers result.
* @returns: TRUE for succeed; FALSE if failed.
*
* Parse key event string and return key symbol and modifiers.
*/
gboolean ibus_key_event_from_string gboolean ibus_key_event_from_string
(const gchar *string, (const gchar *string,
guint *keyval, guint *keyval,
guint *modifiers); guint *modifiers);
/**
* ibus_init:
*
* Init the ibus types.
*
* It is actually a wrapper of g_type_init().
*/
void ibus_init (void); void ibus_init (void);
/**
* ibus_main:
*
* Runs an IBus main loop until ibus_quit() is called in the loop.
*
* @see_also: ibus_quit().
*/
void ibus_main (void); void ibus_main (void);
/**
* ibus_quit:
*
* Stops an IBus from running.
*
* Any calls to ibus_quit() for the loop will return.
* @see_also: ibus_main().
*/
void ibus_quit (void); void ibus_quit (void);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 33 change blocks. 
0 lines changed or deleted 247 lines changed or added


 ibustext.h   ibustext.h 
skipping to change at line 89 skipping to change at line 89
IBusSerializableClass parent; IBusSerializableClass parent;
}; };
GType ibus_text_get_type (void); GType ibus_text_get_type (void);
/** /**
* ibus_text_new_from_string: * ibus_text_new_from_string:
* @str: An text string to be set. * @str: An text string to be set.
* @returns: A newly allocated IBusText. * @returns: A newly allocated IBusText.
* *
* New an IBusText whose content is copied from a text string. * New an IBusText from a string.
*
* @str will be duplicated in IBusText, so feel free to free @str after thi
s function.
*/ */
IBusText *ibus_text_new_from_string (const gchar *str); IBusText *ibus_text_new_from_string (const gchar *str);
/** /**
* ibus_text_new_from_ucs4: * ibus_text_new_from_ucs4:
* @str: An text string to be set. * @str: An text string to be set.
* @returns: A newly allocated IBusText. * @returns: A newly allocated IBusText.
* *
* New an IBusText whose content is copied from a UCS4 encoded text string. * New an IBusText from an UCS-4 encoded string.
*
* @str will be duplicated in IBusText, so feel free to free @str after thi
s function.
*/ */
IBusText *ibus_text_new_from_ucs4 (const gunichar *str); IBusText *ibus_text_new_from_ucs4 (const gunichar *str);
/** /**
* ibus_text_new_from_static_string: * ibus_text_new_from_static_string:
* @str: An text string to be set. * @str: An text string to be set.
* @returns: A newly allocated IBusText. * @returns: A newly allocated IBusText.
* *
* New an IBusText whose content is from a static string. * New an IBusText from a static string.
* Note that it is the developer's duty to ensure @str is static. *
* Since @str is a static string which won't be freed.
* This function will NOT duplicate @str.
*/ */
IBusText *ibus_text_new_from_static_string (const gchar *str); IBusText *ibus_text_new_from_static_string (const gchar *str);
/** /**
* ibus_text_new_from_printf: * ibus_text_new_from_printf:
* @fmt: printf format string. * @fmt: printf format string.
* @...: arguments for @fmt. * @...: arguments for @fmt.
* @returns: A newly allocated IBusText. * @returns: A newly allocated IBusText.
* *
* New an IBusText from a printf expression. * New an IBusText from a printf expression.
*
* The result of printf expression is stored in the new IBusText instance.
*/ */
IBusText *ibus_text_new_from_printf (const gchar *fmt, IBusText *ibus_text_new_from_printf (const gchar *fmt,
...); ...);
/** /**
* ibus_text_new_from_unichar: * ibus_text_new_from_unichar:
* @c: A single UCS4-encoded character. * @c: A single UCS4-encoded character.
* @returns: A newly allocated IBusText. * @returns: A newly allocated IBusText.
* *
* New an IBusText from a single UCS4-encoded character. * New an IBusText from a single UCS4-encoded character.
 End of changes. 4 change blocks. 
4 lines changed or deleted 14 lines changed or added


 ibustypes.h   ibustypes.h 
skipping to change at line 100 skipping to change at line 100
IBUS_MODIFIER_MASK = 0x5c001fff IBUS_MODIFIER_MASK = 0x5c001fff
} IBusModifierType; } IBusModifierType;
/** /**
* IBusCapabilite: * IBusCapabilite:
* @IBUS_CAP_PREEDIT_TEXT: UI is capable to show pre-edit text. * @IBUS_CAP_PREEDIT_TEXT: UI is capable to show pre-edit text.
* @IBUS_CAP_AUXILIARY_TEXT: UI is capable to show auxiliary text. * @IBUS_CAP_AUXILIARY_TEXT: UI is capable to show auxiliary text.
* @IBUS_CAP_LOOKUP_TABLE: UI is capable to show the lookup table. * @IBUS_CAP_LOOKUP_TABLE: UI is capable to show the lookup table.
* @IBUS_CAP_FOCUS: UI is capable to get focus. * @IBUS_CAP_FOCUS: UI is capable to get focus.
* @IBUS_CAP_PROPERTY: UI is capable to have property. * @IBUS_CAP_PROPERTY: UI is capable to have property.
* @IBUS_CAP_SURROUNDING_TEXT: Client can provide surround text,
* or IME can handle surround text.
* *
* Capability flags of UI. * Capability flags of UI.
*/ */
typedef enum { typedef enum {
IBUS_CAP_PREEDIT_TEXT = 1 << 0, IBUS_CAP_PREEDIT_TEXT = 1 << 0,
IBUS_CAP_AUXILIARY_TEXT = 1 << 1, IBUS_CAP_AUXILIARY_TEXT = 1 << 1,
IBUS_CAP_LOOKUP_TABLE = 1 << 2, IBUS_CAP_LOOKUP_TABLE = 1 << 2,
IBUS_CAP_FOCUS = 1 << 3, IBUS_CAP_FOCUS = 1 << 3,
IBUS_CAP_PROPERTY = 1 << 4, IBUS_CAP_PROPERTY = 1 << 4,
IBUS_CAP_SURROUNDING_TEXT = 1 << 5, IBUS_CAP_SURROUNDING_TEXT = 1 << 5,
} IBusCapabilite; } IBusCapabilite;
/** /**
* IBusOrientation:
* @IBUS_ORIENTATION_HORIZONTAL: Horizontal orientation.
* @IBUS_ORIENTATION_VERTICAL: Vertival orientation.
* @IBUS_ORIENTATION_SYSTEM: Use ibus global orientation setup.
*
* Orientation of UI.
*/
typedef enum {
IBUS_ORIENTATION_HORIZONTAL = 0,
IBUS_ORIENTATION_VERTICAL = 1,
IBUS_ORIENTATION_SYSTEM = 2,
} IBusOrientation;
/**
* IBusRectangle: * IBusRectangle:
* @x: x coordinate. * @x: x coordinate.
* @y: y coordinate. * @y: y coordinate.
* @width: width of the rectangle. * @width: width of the rectangle.
* @height: height of the renctangl. * @height: height of the renctangl.
* *
* Rectangle definition. * Rectangle definition.
*/ */
typedef struct _IBusRectangle IBusRectangle; typedef struct _IBusRectangle IBusRectangle;
struct _IBusRectangle { struct _IBusRectangle {
 End of changes. 2 change blocks. 
0 lines changed or deleted 16 lines changed or added


 ibusversion.h   ibusversion.h 
skipping to change at line 21 skipping to change at line 21
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * 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: ibusversion
* @short_description: Current version of IBus.
* @stability: Stable
*
* IBusVersion shows the current IBus version.
*/
#ifndef __IBUS_VERSION_H_ #ifndef __IBUS_VERSION_H_
#define __IBUS_VERSION_H_ #define __IBUS_VERSION_H_
/* compile time version /* compile time version
*/ */
/**
* IBUS_MAJOR_VERSION:
*
* IBus major version.
*/
#define IBUS_MAJOR_VERSION (1) #define IBUS_MAJOR_VERSION (1)
/**
* IBUS_MINOR_VERSION:
*
* IBus minor version.
*/
#define IBUS_MINOR_VERSION (2) #define IBUS_MINOR_VERSION (2)
/**
* IBUS_MICRO_VERSION:
*
* IBus micro version.
*/
#define IBUS_MICRO_VERSION (0) #define IBUS_MICRO_VERSION (0)
/* check whether a Gtk+ version equal to or greater than /**
* major.minor.micro is present. * IBUS_CHECK_VERSION:
* @major: Major version of ibus.
* @minor: Minor version of ibus.
* @micro: Micro version of ibus.
*
* Check whether the current IBus version is equal to or greater than
* given major.minor.micro.
*/ */
#define IBUS_CHECK_VERSION(major,minor,micro) \ #define IBUS_CHECK_VERSION(major,minor,micro) \
(IBUS_MAJOR_VERSION > (major) || \ (IBUS_MAJOR_VERSION > (major) || \
(IBUS_MAJOR_VERSION == (major) && IBUS_MINOR_VERSION > (minor)) || \ (IBUS_MAJOR_VERSION == (major) && IBUS_MINOR_VERSION > (minor)) || \
(IBUS_MAJOR_VERSION == (major) && IBUS_MINOR_VERSION == (minor) && \ (IBUS_MAJOR_VERSION == (major) && IBUS_MINOR_VERSION == (minor) && \
IBUS_MICRO_VERSION >= (micro))) IBUS_MICRO_VERSION >= (micro)))
#endif #endif
 End of changes. 6 change blocks. 
3 lines changed or deleted 33 lines changed or added


 ibusxml.h   ibusxml.h 
skipping to change at line 21 skipping to change at line 21
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * 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: ibusxml
* @short_description: XML handling functions for IBus.
* @stability: Stable
*
* IBusXML lists data structure and handling function for XML in IBus.
*/
#ifndef __IBUS_XML_H__ #ifndef __IBUS_XML_H__
#define __IBUS_XML_H__ #define __IBUS_XML_H__
#include <glib.h> #include <glib.h>
/**
* XMLNode:
* @name: Name of XML tag.
* @text: Text enclosed by XML start tag and end tag. i.e. <tag>text</tag>.
* @attributes: Attributes of the XML node.
* @sub_nodes: Children node of this XML node.
*
* A data type representing an XML nod.
*/
typedef struct { typedef struct {
gchar *name; gchar *name;
gchar *text; gchar *text;
gchar **attributes; gchar **attributes;
GList *sub_nodes; GList *sub_nodes;
} XMLNode; } XMLNode;
/**
* ibus_xml_parse_file:
* @name: File name to be parsed.
* @returns: Root node of parsed XML tree.
*
* Parse an XML file and return a corresponding XML tree.
*/
XMLNode *ibus_xml_parse_file (const gchar *name); XMLNode *ibus_xml_parse_file (const gchar *name);
/**
* ibus_xml_parse_buffer:
* @buffer: Buffer to be parsed.
* @returns: Root node of parsed XML tree.
*
* Parse a string buffer which contains an XML-formatted string,
* and return a corresponding XML tree.
*/
XMLNode *ibus_xml_parse_buffer (const gchar *buffer); XMLNode *ibus_xml_parse_buffer (const gchar *buffer);
/**
* ibus_xml_free:
* @node: Root node of an XML tree.
*
* Free an XML tree.
*/
void ibus_xml_free (XMLNode *node); void ibus_xml_free (XMLNode *node);
/**
* ibus_xml_output:
* @node: Root node of an XML tree.
* @output: GString which stores the output.
*
* Output an XML tree to a GString.
*/
void ibus_xml_output (const XMLNode *node, void ibus_xml_output (const XMLNode *node,
GString *output); GString *output);
#endif #endif
 End of changes. 6 change blocks. 
0 lines changed or deleted 47 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/