ibusbus.h   ibusbus.h 
skipping to change at line 126 skipping to change at line 126
* *
* This function sends a "HELLO" message to DBus daemon, * This function sends a "HELLO" message to DBus daemon,
* which replies the unique name of current IBus process. * which replies the unique name of current IBus process.
*/ */
const gchar *ibus_bus_hello (IBusBus *bus); const gchar *ibus_bus_hello (IBusBus *bus);
/** /**
* ibus_bus_request_name: * ibus_bus_request_name:
* @bus: the IBusBus instance to be processed. * @bus: the IBusBus instance to be processed.
* @name: Name to be requested. * @name: Name to be requested.
* @flags: Flags (FixMe). * @flags: IBusBusNameFlag.
* @returns: 0 if failed; positive number otherwise. * @returns: 0 if failed; IBusBusRequestNameReply otherwise.
* *
* Request a name from IBus daemon synchronously. * Request a name from IBus daemon synchronously.
*/ */
guint ibus_bus_request_name (IBusBus *bus, guint32 ibus_bus_request_name (IBusBus *bus,
const gchar *name, const gchar *name,
guint flags); guint32 flags);
/** /**
* ibus_bus_request_name_async: * ibus_bus_request_name_async:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @name: Name to be requested. * @name: Name to be requested.
* @flags: Flags (FixMe). * @flags: Flags (FixMe).
* @timeout_msec: The timeout in milliseconds or -1 to use the default time out. * @timeout_msec: The timeout in milliseconds or -1 to use the default time out.
* @cancellable: A #GCancellable or %NULL. * @cancellable: A #GCancellable or %NULL.
* @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL
* if you don't care about the result of the method invocation. * if you don't care about the result of the method invocation.
skipping to change at line 220 skipping to change at line 220
* @returns: 0 if failed; positive number otherwise. * @returns: 0 if failed; positive number otherwise.
* *
* Finishes an operation started with ibus_bus_release_name_async(). * Finishes an operation started with ibus_bus_release_name_async().
*/ */
guint ibus_bus_release_name_async_finish guint ibus_bus_release_name_async_finish
(IBusBus *bus, (IBusBus *bus,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
/** /**
* ibus_bus_list_queued_owners:
* @bus: An IBusBus.
* @name: Name to be queried.
* @returns: (transfer full) (element-type utf8):
* The unique bus names of connections currently queued for @name
.
*
* Lists the unique bus names of connections currently queued for a bus nam
e.
*
* FIXME add an asynchronous version.
*/
GList * ibus_bus_list_queued_owners
(IBusBus *bus,
const gchar *name);
/**
* ibus_bus_name_has_owner: * ibus_bus_name_has_owner:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @name: Name to be checked. * @name: Name to be checked.
* @returns: %TRUE if the name has owner, %FALSE otherwise. * @returns: %TRUE if the name has owner, %FALSE otherwise.
* *
* Checks whether the name has owner synchronously. * Checks whether the name has owner synchronously.
*/ */
gboolean ibus_bus_name_has_owner (IBusBus *bus, gboolean ibus_bus_name_has_owner (IBusBus *bus,
const gchar *name); const gchar *name);
 End of changes. 4 change blocks. 
4 lines changed or deleted 21 lines changed or added


 ibusenumtypes.h   ibusenumtypes.h 
skipping to change at line 160 skipping to change at line 160
*/ */
GType ibus_orientation_get_type (void) G_GNUC_CONST; GType ibus_orientation_get_type (void) G_GNUC_CONST;
/** /**
* IBUS_TYPE_ORIENTATION: * IBUS_TYPE_ORIENTATION:
* @returns: GType of IBUS_ORIENTATION * @returns: GType of IBUS_ORIENTATION
* *
* Returns the type of IBUS_ORIENTATION as GType. * Returns the type of IBUS_ORIENTATION as GType.
*/ */
#define IBUS_TYPE_ORIENTATION (ibus_orientation_get_type ()) #define IBUS_TYPE_ORIENTATION (ibus_orientation_get_type ())
/**
* ibus_bus_name_flag_get_type:
* @returns: GType of IBUS_BUS_NAME_FLAG
*
* Returns the type of IBUS_BUS_NAME_FLAG as GType.
*/
GType ibus_bus_name_flag_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_BUS_NAME_FLAG:
* @returns: GType of IBUS_BUS_NAME_FLAG
*
* Returns the type of IBUS_BUS_NAME_FLAG as GType.
*/
#define IBUS_TYPE_BUS_NAME_FLAG (ibus_bus_name_flag_get_type ())
/**
* ibus_bus_request_name_reply_get_type:
* @returns: GType of IBUS_BUS_REQUEST_NAME_REPLY
*
* Returns the type of IBUS_BUS_REQUEST_NAME_REPLY as GType.
*/
GType ibus_bus_request_name_reply_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_BUS_REQUEST_NAME_REPLY:
* @returns: GType of IBUS_BUS_REQUEST_NAME_REPLY
*
* Returns the type of IBUS_BUS_REQUEST_NAME_REPLY as GType.
*/
#define IBUS_TYPE_BUS_REQUEST_NAME_REPLY (ibus_bus_request_name_reply_get_t
ype ())
G_END_DECLS G_END_DECLS
#endif /* __IBUS_ENUM_TYPES_H__ */ #endif /* __IBUS_ENUM_TYPES_H__ */
/* Generated data ends here */ /* Generated data ends here */
 End of changes. 1 change blocks. 
0 lines changed or deleted 31 lines changed or added


 ibusproperty.h   ibusproperty.h 
skipping to change at line 166 skipping to change at line 166
IBusSerializableClass parent; IBusSerializableClass parent;
}; };
GType ibus_property_get_type (); GType ibus_property_get_type ();
/** /**
* ibus_property_new: * ibus_property_new:
* @key: Unique Identity for the IBusProperty. * @key: Unique Identity for the IBusProperty.
* @type: IBusPropType of IBusProperty. * @type: IBusPropType of IBusProperty.
* @label: Text shown in UI. * @label: Text shown in UI.
* @icon: Icon file for the IBusProperty. * @icon: (allow-none): Icon file for the IBusProperty.
* @tooltip: Message shown if mouse hovered the IBusProperty. * @tooltip: Message shown if mouse hovered the IBusProperty.
* @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event. * @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
* @visible: Whether the IBusProperty is visible. * @visible: Whether the IBusProperty is visible.
* @state: IBusPropState of IBusProperty. * @state: IBusPropState of IBusProperty.
* @prop_list: IBusPropList that contains sub IBusProperties. * @prop_list: (allow-none): IBusPropList that contains sub IBusProperties.
* @returns: A newly allocated IBusProperty. * @returns: A newly allocated IBusProperty.
* *
* New a IBusProperty. * New a IBusProperty.
*/ */
IBusProperty *ibus_property_new (const gchar *key, IBusProperty *ibus_property_new (const gchar *key,
IBusPropType type, IBusPropType type,
IBusText *label, IBusText *label,
const gchar *icon, const gchar *icon,
IBusText *tooltip, IBusText *tooltip,
gboolean sensitive, gboolean sensitive,
gboolean visible, gboolean visible,
IBusPropState state, IBusPropState state,
IBusPropList *prop_list); IBusPropList *prop_list);
/** /**
* ibus_property_get_key:
* @prop: An IBusProperty.
* @returns: the key of IBusProperty. Should not be freed.
*
* Get the key of IBusProperty.
*/
const gchar * ibus_property_get_key (IBusProperty *prop);
/**
* ibus_property_get_prop_type:
* @prop: An IBusProperty.
* @returns: the type of IBusProperty.
*
* Get the type of IBusProperty.
*/
IBusPropType ibus_property_get_prop_type(IBusProperty *prop);
/**
* ibus_property_get_label:
* @prop: An IBusProperty.
* @returns: the label of IBusProperty. Should not be freed.
*
* Get the label of IBusProperty.
*/
const IBusText * ibus_property_get_label (IBusProperty *prop);
/**
* ibus_property_set_label: * ibus_property_set_label:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @label: Text shown in UI. * @label: Text shown in UI.
* *
* Set the label of IBusProperty. * Set the label of IBusProperty.
*/ */
void ibus_property_set_label (IBusProperty *prop, void ibus_property_set_label (IBusProperty *prop,
IBusText *label); IBusText *label);
/** /**
* ibus_property_get_icon:
* @prop: An IBusProperty.
* @returns: the icon of IBusProperty. Should not be freed.
*
* Get the icon of IBusProperty.
*/
const gchar * ibus_property_get_icon (IBusProperty *prop);
/**
* ibus_property_set_icon: * ibus_property_set_icon:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @icon: Icon shown in UI. It could be a full path of an icon file or an i con name. * @icon: Icon shown in UI. It could be a full path of an icon file or an i con name.
* *
* Set the icon of IBusProperty. * Set the icon of IBusProperty.
*/ */
void ibus_property_set_icon (IBusProperty *prop, void ibus_property_set_icon (IBusProperty *prop,
const gchar *icon); const gchar *icon);
/** /**
* ibus_property_get_tooltip:
* @prop: An IBusProperty.
* @returns: the tooltip of IBusProperty. Should not be freed.
*
* Get the tooltip of IBusProperty.
*/
const IBusText * ibus_property_get_tooltip (IBusProperty *prop);
/**
* ibus_property_set_tooltip: * ibus_property_set_tooltip:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @tooltip: Text of the tooltip. * @tooltip: Text of the tooltip.
* *
* Set the tooltip of IBusProperty. * Set the tooltip of IBusProperty.
*/ */
void ibus_property_set_tooltip (IBusProperty *prop, void ibus_property_set_tooltip (IBusProperty *prop,
IBusText *tooltip); IBusText *tooltip);
/** /**
* ibus_property_get_sensitive:
* @prop: An IBusProperty.
* @returns: the sensitive of IBusProperty.
*
* Get the sensitive of IBusProperty.
*/
gboolean ibus_property_get_sensitive(IBusProperty *prop);
/**
* ibus_property_set_sensitive: * ibus_property_set_sensitive:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @sensitive: Whether the IBusProperty is sensitive. * @sensitive: Whether the IBusProperty is sensitive.
* *
* Set whether the IBusProperty is sensitive. * Set whether the IBusProperty is sensitive.
*/ */
void ibus_property_set_sensitive(IBusProperty *prop, void ibus_property_set_sensitive(IBusProperty *prop,
gboolean sensitive); gboolean sensitive);
/** /**
* ibus_property_get_visible:
* @prop: An IBusProperty.
* @returns: the visible of IBusProperty.
*
* Get the visible of IBusProperty.
*/
gboolean ibus_property_get_visible (IBusProperty *prop);
/**
* ibus_property_set_visible: * ibus_property_set_visible:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @visible: Whether the IBusProperty is visible. * @visible: Whether the IBusProperty is visible.
* *
* Set whether the IBusProperty is visible. * Set whether the IBusProperty is visible.
*/ */
void ibus_property_set_visible (IBusProperty *prop, void ibus_property_set_visible (IBusProperty *prop,
gboolean visible); gboolean visible);
/** /**
* ibus_property_get_state:
* @prop: An IBusProperty.
* @returns: the state of IBusProperty.
*
* Get the state of IBusProperty.
*/
IBusPropState ibus_property_get_state (IBusProperty *prop);
/**
* ibus_property_set_state: * ibus_property_set_state:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @state: The state of the IBusProperty. * @state: The state of the IBusProperty.
* *
* Set the state of the IBusProperty. * Set the state of the IBusProperty.
*/ */
void ibus_property_set_state (IBusProperty *prop, void ibus_property_set_state (IBusProperty *prop,
IBusPropState state); IBusPropState state);
/** /**
* ibus_property_get_sub_props:
* @prop: An IBusProperty.
* @returns: the IBusPropList of IBusProperty. Should not be freed.
*
* Get the IBusPropList of IBusProperty.
*/
const IBusPropList *
ibus_property_get_sub_props(IBusProperty *prop);
/**
* ibus_property_set_sub_props: * ibus_property_set_sub_props:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @prop_list: IBusPropList that contains sub IBusProperties. * @prop_list: IBusPropList that contains sub IBusProperties.
* *
* Set the sub IBusProperties. * Set the sub IBusProperties.
*/ */
void ibus_property_set_sub_props(IBusProperty *prop, void ibus_property_set_sub_props(IBusProperty *prop,
IBusPropList *prop_list); IBusPropList *prop_list);
/** /**
 End of changes. 9 change blocks. 
2 lines changed or deleted 84 lines changed or added


 ibustext.h   ibustext.h 
skipping to change at line 113 skipping to change at line 113
* @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 from an UCS-4 encoded 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. * @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: (skip)
* @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 from a static string. * New an IBusText from a static string.
* *
* Since @str is a static string which won't be freed. * Since @str is a static string which won't be freed.
* This function will NOT duplicate @str. * 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);
skipping to change at line 172 skipping to change at line 172
* ibus_text_get_length: * ibus_text_get_length:
* @text: An IBusText. * @text: An IBusText.
* @returns: Number of character in @text, not counted by bytes. * @returns: Number of character in @text, not counted by bytes.
* *
* Return number of characters in an IBusText. * Return number of characters in an IBusText.
* This function is based on g_utf8_strlen(), so unlike strlen(), * This function is based on g_utf8_strlen(), so unlike strlen(),
* it does not count by bytes but characters instead. * it does not count by bytes but characters instead.
*/ */
guint ibus_text_get_length (IBusText *text); guint ibus_text_get_length (IBusText *text);
/**
* ibus_text_get_is_static: (skip)
* @text: An IBusText.
* @returns: the is_static in @text.
*
* Return the is_static in an IBusText.
*/
gboolean ibus_text_get_is_static (IBusText *text);
/**
* ibus_text_get_text:
* @text: An IBusText.
* @returns: the text in @text.
*
* Return the text in an IBusText. Should not be freed.
*/
const gchar * ibus_text_get_text (IBusText *text);
/**
* ibus_text_get_attributes:
* @text: An IBusText.
* @returns: the attrs in @text.
*
* Return the attributes in an IBusText. Should not be freed.
*/
const IBusAttrList *
ibus_text_get_attributes (IBusText *text);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 28 lines changed or added


 ibustypes.h   ibustypes.h 
skipping to change at line 147 skipping to change at line 147
* *
* Orientation of UI. * Orientation of UI.
*/ */
typedef enum { typedef enum {
IBUS_ORIENTATION_HORIZONTAL = 0, IBUS_ORIENTATION_HORIZONTAL = 0,
IBUS_ORIENTATION_VERTICAL = 1, IBUS_ORIENTATION_VERTICAL = 1,
IBUS_ORIENTATION_SYSTEM = 2, IBUS_ORIENTATION_SYSTEM = 2,
} IBusOrientation; } IBusOrientation;
/** /**
* IBusBusNameFlag:
* @IBUS_BUS_NAME_FLAG_ALLOW_REPLACEMENT:
* same as DBUS_NAME_FLAG_ALLOW_REPLACEMENT
* @IBUS_BUS_NAME_FLAG_REPLACE_EXISTING:
* same as DBUS_NAME_FLAG_REPLACE_EXISTING
* @IBUS_BUS_NAME_FLAG_DO_NOT_QUEUE:
* same as DBUS_NAME_FLAG_DO_NOT_QUEUE
*/
typedef enum {
IBUS_BUS_NAME_FLAG_ALLOW_REPLACEMENT = (1 << 0),
IBUS_BUS_NAME_FLAG_REPLACE_EXISTING = (1 << 1),
IBUS_BUS_NAME_FLAG_DO_NOT_QUEUE = (1 << 2),
} IBusBusNameFlag;
/**
* IBusBusRequestNameReply:
* @IBUS_BUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
* same as DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER
* @IBUS_BUS_REQUEST_NAME_REPLY_IN_QUEUE:
* same as DBUS_REQUEST_NAME_REPLY_IN_QUEUE
* @IBUS_BUS_REQUEST_NAME_REPLY_EXISTS:
* same as DBUS_REQUEST_NAME_REPLY_EXISTS
* @IBUS_BUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
* same as DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER
*/
typedef enum {
IBUS_BUS_REQUEST_NAME_REPLY_PRIMARY_OWNER = 1,
IBUS_BUS_REQUEST_NAME_REPLY_IN_QUEUE = 2,
IBUS_BUS_REQUEST_NAME_REPLY_EXISTS = 3,
IBUS_BUS_REQUEST_NAME_REPLY_ALREADY_OWNER = 4,
} IBusBusRequestNameReply;
/**
* 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. 1 change blocks. 
0 lines changed or deleted 33 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/