ibus.h   ibus.h 
skipping to change at line 55 skipping to change at line 55
#include <ibuskeys.h> #include <ibuskeys.h>
#include <ibusenumtypes.h> #include <ibusenumtypes.h>
#include <ibushotkey.h> #include <ibushotkey.h>
#include <ibusxml.h> #include <ibusxml.h>
#include <ibusenginedesc.h> #include <ibusenginedesc.h>
#include <ibusobservedpath.h> #include <ibusobservedpath.h>
#include <ibuscomponent.h> #include <ibuscomponent.h>
#include <ibusconfig.h> #include <ibusconfig.h>
#include <ibusconfigservice.h> #include <ibusconfigservice.h>
#include <ibuspanelservice.h> #include <ibuspanelservice.h>
#include <ibusutil.h>
#undef __IBUS_H_INSIDE__ #undef __IBUS_H_INSIDE__
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ibusbus.h   ibusbus.h 
skipping to change at line 848 skipping to change at line 848
* Finishes an operation started with ibus_bus_is_global_engine_enabled_asy nc(). * Finishes an operation started with ibus_bus_is_global_engine_enabled_asy nc().
*/ */
gboolean ibus_bus_is_global_engine_enabled_async_finish gboolean ibus_bus_is_global_engine_enabled_async_finish
(IBusBus *bus, (IBusBus *bus,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
/** /**
* ibus_bus_get_global_engine: * ibus_bus_get_global_engine:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: The description of current global engine, or %NULL if there is * @returns: (transfer none): The description of current global engine,
no * or %NULL if there is no global engine.
* global engine.
* *
* Get the description of current global engine synchronously. * Get the description of current global engine synchronously.
*/ */
IBusEngineDesc * IBusEngineDesc *
ibus_bus_get_global_engine (IBusBus *bus); ibus_bus_get_global_engine (IBusBus *bus);
/** /**
* ibus_bus_get_global_engine_async: * ibus_bus_get_global_engine_async:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @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.
skipping to change at line 881 skipping to change at line 881
GAsyncReadyCallback GAsyncReadyCallback
callback, callback,
gpointer user_data); gpointer user_data);
/** /**
* ibus_bus_get_global_engine_async_finish: * ibus_bus_get_global_engine_async_finish:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
* ibus_bus_get_global_engine_async_finish(). * ibus_bus_get_global_engine_async_finish().
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: The description of current global engine, or %NULL if there i * @returns: (transfer none): The description of current global engine,
s no * or %NULL if there is no global engine.
* global engine.
* *
* Finishes an operation started with ibus_bus_get_global_engine_async_fini sh(). * Finishes an operation started with ibus_bus_get_global_engine_async_fini sh().
*/ */
IBusEngineDesc * IBusEngineDesc *
ibus_bus_get_global_engine_async_finish ibus_bus_get_global_engine_async_finish
(IBusBus *bus, (IBusBus *bus,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
/** /**
 End of changes. 2 change blocks. 
6 lines changed or deleted 4 lines changed or added


 ibusengine.h   ibusengine.h 
skipping to change at line 172 skipping to change at line 172
* @path: Path for IBusService. * @path: Path for IBusService.
* @connection: An opened GDBusConnection. * @connection: An opened GDBusConnection.
* @returns: A newly allocated IBusEngine. * @returns: A newly allocated IBusEngine.
* *
* New an IBusEngine. * New an IBusEngine.
*/ */
IBusEngine *ibus_engine_new (const gchar *engine_name, IBusEngine *ibus_engine_new (const gchar *engine_name,
const gchar *object_path, const gchar *object_path,
GDBusConnection *connection); GDBusConnection *connection);
/** /**
* ibus_engine_new_type: * ibus_engine_new_with_type:
* @engine_type: GType of subclass of IBUS_TYPE_ENGINE * @engine_type: GType of #IBusEngine.
* @engine_name: Name of the IBusObject. * @engine_name: Name of the IBusObject.
* @object_path: Path for IBusService. * @object_path: Path for IBusService.
* @connection: An opened GDBusConnection. * @connection: An opened GDBusConnection.
* @returns: A newly allocated IBusEngine. * @returns: A newly allocated IBusEngine.
* *
* New an IBusEngine. * New an IBusEngine.
*/ */
IBusEngine *ibus_engine_new_type (GType engine_type, IBusEngine *ibus_engine_new_with_type (GType engine_type,
const gchar *engine_name, const gchar *engine_name,
const gchar *object_path, const gchar *object_path,
GDBusConnection *connection); GDBusConnection *connection);
/** /**
* ibus_engine_commit_text: * ibus_engine_commit_text:
* @engine: An IBusEngine. * @engine: An IBusEngine.
* @text: String commit to IBusEngine. * @text: String commit to IBusEngine.
* *
* Commit output of input method to IBus client. * Commit output of input method to IBus client.
skipping to change at line 410 skipping to change at line 410
* *
* Delete surrounding text. * Delete surrounding text.
*/ */
void ibus_engine_delete_surrounding_text(IBusEngine *engine, void ibus_engine_delete_surrounding_text(IBusEngine *engine,
gint offset, gint offset,
guint nchars); guint nchars);
/** /**
* ibus_engine_get_surrounding_text: * ibus_engine_get_surrounding_text:
* @engine: An IBusEngine. * @engine: An IBusEngine.
* @text: (allow-none): Location to store surrounding text. * @text: (out) (transfer none) (allow-none): Location to store surrounding
* @cursor_pos: (allow-none): Cursor position in characters in @text. text.
* @anchor_pos: (allow-none): Anchor position of selection in @text. * @cursor_pos: (out) (allow-none): Cursor position in characters in @text.
* @anchor_pos: (out) (allow-none): Anchor position of selection in @text.
* *
* Get surrounding text. * Get surrounding text.
* *
* It is also used to tell the input-context that the engine will * It is also used to tell the input-context that the engine will
* utilize surrounding-text. In that case, it must be called in * utilize surrounding-text. In that case, it must be called in
* #IBusEngine::enable handler, with both @text and @cursor set to * #IBusEngine::enable handler, with both @text and @cursor set to
* %NULL. * %NULL.
* *
* @see_also #IBusEngine::set-surrounding-text * @see_also #IBusEngine::set-surrounding-text
*/ */
 End of changes. 3 change blocks. 
6 lines changed or deleted 7 lines changed or added


 ibusenginedesc.h   ibusenginedesc.h 
skipping to change at line 257 skipping to change at line 257
*/ */
const gchar *ibus_engine_desc_get_hotkeys (IBusEngineDesc *info); const gchar *ibus_engine_desc_get_hotkeys (IBusEngineDesc *info);
/** /**
* ibus_engine_desc_get_symbol: * ibus_engine_desc_get_symbol:
* @info: An IBusEngineDesc * @info: An IBusEngineDesc
* @returns: symbol property in IBusEngineDesc * @returns: symbol property in IBusEngineDesc
* *
* Return the symbol property in IBusEngineDesc. It should not be freed. * Return the symbol property in IBusEngineDesc. It should not be freed.
*/ */
const gchar *ibus_engine_desc_get_symbol const gchar *ibus_engine_desc_get_symbol (IBusEngineDesc *info);
(IBusEngineDesc *info);
/**
* ibus_engine_desc_get_setup:
* @info: An IBusEngineDesc
* @returns: setup property in IBusEngineDesc
*
* Return the setup property in IBusEngineDesc. It should not be freed.
*/
const gchar *ibus_engine_desc_get_setup (IBusEngineDesc *info);
/** /**
* ibus_engine_desc_output: * ibus_engine_desc_output:
* @info: An IBusEngineDesc * @info: An IBusEngineDesc
* @output: XML-formatted Input method engine description. * @output: XML-formatted Input method engine description.
* @indent: Number of indent (showed as 4 spaces). * @indent: Number of indent (showed as 4 spaces).
* *
* Output XML-formatted input method engine description. * Output XML-formatted input method engine description.
* The result will be append to GString specified in @output. * The result will be append to GString specified in @output.
*/ */
 End of changes. 1 change blocks. 
2 lines changed or deleted 10 lines changed or added


 ibusfactory.h   ibusfactory.h 
skipping to change at line 130 skipping to change at line 130
IBusService parent; IBusService parent;
IBusFactoryPrivate *priv; IBusFactoryPrivate *priv;
/* instance members */ /* instance members */
}; };
struct _IBusFactoryClass { struct _IBusFactoryClass {
/*< private >*/ /*< private >*/
IBusServiceClass parent; IBusServiceClass parent;
/*< public >*/
/* signals */ /* signals */
IBusEngine * IBusEngine *
(* create_engine) (* create_engine)
(IBusFactory *factory, (IBusFactory *factory,
const gchar *engine_name); const gchar *engine_name);
/*< private >*/ /*< private >*/
/* padding */ /* padding */
gpointer pdummy[7]; gpointer pdummy[7];
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ibusproperty.h   ibusproperty.h 
skipping to change at line 116 skipping to change at line 116
* No effect on other types. * No effect on other types.
*/ */
typedef enum { typedef enum {
PROP_STATE_UNCHECKED = 0, PROP_STATE_UNCHECKED = 0,
PROP_STATE_CHECKED = 1, PROP_STATE_CHECKED = 1,
PROP_STATE_INCONSISTENT = 2, PROP_STATE_INCONSISTENT = 2,
} IBusPropState; } IBusPropState;
typedef struct _IBusProperty IBusProperty; typedef struct _IBusProperty IBusProperty;
typedef struct _IBusPropertyClass IBusPropertyClass; typedef struct _IBusPropertyClass IBusPropertyClass;
typedef struct _IBusPropertyPrivate IBusPropertyPrivate;
#ifndef __PROPLIST_DEFINED #ifndef __PROPLIST_DEFINED
#define __PROPLIST_DEFINED #define __PROPLIST_DEFINED
typedef struct _IBusPropList IBusPropList; typedef struct _IBusPropList IBusPropList;
typedef struct _IBusPropListClass IBusPropListClass; typedef struct _IBusPropListClass IBusPropListClass;
#endif #endif
/** /**
* IBusProperty: * IBusProperty:
* @key: Unique Identity for the IBusProperty. * @key: Unique Identity for the IBusProperty.
skipping to change at line 139 skipping to change at line 140
* @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event. * @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
* @visible: Whether the IBusProperty is visible. * @visible: Whether the IBusProperty is visible.
* @type: IBusPropType of IBusProperty. * @type: IBusPropType of IBusProperty.
* @state: IBusPropState of IBusProperty. * @state: IBusPropState of IBusProperty.
* @sub_props: IBusPropList that contains sub IBusProperties. These IBusPro perties are usually * @sub_props: IBusPropList that contains sub IBusProperties. These IBusPro perties are usually
* shown as sub menu item. * shown as sub menu item.
* *
* UI component for input method engine property. * UI component for input method engine property.
*/ */
struct _IBusProperty { struct _IBusProperty {
/*< private >*/
IBusSerializable parent; IBusSerializable parent;
IBusPropertyPrivate *priv;
/*< public >*/ gpointer pdummy[7];
gchar *key;
gchar *icon;
IBusText *label;
IBusText *tooltip;
gboolean sensitive;
gboolean visible;
guint type;
guint state;
IBusPropList *sub_props;
}; };
struct _IBusPropertyClass { struct _IBusPropertyClass {
IBusSerializableClass parent; IBusSerializableClass parent;
}; };
GType ibus_property_get_type (); GType ibus_property_get_type ();
/** /**
* ibus_property_new: * ibus_property_new:
skipping to change at line 196 skipping to change at line 188
/** /**
* ibus_property_get_key: * ibus_property_get_key:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @returns: the key of IBusProperty. Should not be freed. * @returns: the key of IBusProperty. Should not be freed.
* *
* Get the key of IBusProperty. * Get the key of IBusProperty.
*/ */
const gchar * ibus_property_get_key (IBusProperty *prop); 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: * ibus_property_get_label:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @returns: the label of IBusProperty. Should not be freed. * @returns: (transfer none): the label of IBusProperty. Should not be free d.
* *
* Get the label of IBusProperty. * Get the label of IBusProperty.
*/ */
const IBusText * ibus_property_get_label (IBusProperty *prop); 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);
skipping to change at line 245 skipping to change at line 228
* @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: * ibus_property_get_tooltip:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @returns: the tooltip of IBusProperty. Should not be freed. * @returns: (transfer none): the tooltip of IBusProperty. Should not be fr eed.
* *
* Get the tooltip of IBusProperty. * Get the tooltip of IBusProperty.
*/ */
const IBusText * ibus_property_get_tooltip (IBusProperty *prop); 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);
skipping to change at line 300 skipping to change at line 283
* 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_property_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_state: * ibus_property_get_state:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @returns: the state of IBusProperty. * @returns: the state of IBusProperty.
* *
* Get the state of IBusProperty. * Get the state of IBusProperty.
*/ */
IBusPropState ibus_property_get_state (IBusProperty *prop); IBusPropState ibus_property_get_state (IBusProperty *prop);
/** /**
* ibus_property_set_state: * ibus_property_set_state:
skipping to change at line 321 skipping to change at line 313
* @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: * ibus_property_get_sub_props:
* @prop: An IBusProperty. * @prop: An IBusProperty.
* @returns: the IBusPropList of IBusProperty. Should not be freed. * @returns: (transfer none): the IBusPropList of IBusProperty.
* Should not be freed.
* *
* Get the IBusPropList of IBusProperty. * Get the IBusPropList of IBusProperty.
*/ */
const IBusPropList * IBusPropList * ibus_property_get_sub_props(IBusProperty *prop);
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. 12 change blocks. 
28 lines changed or deleted 20 lines changed or added


 ibustext.h   ibustext.h 
skipping to change at line 135 skipping to change at line 135
* 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. * 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,
...); ...) G_GNUC_PRINTF (1, 2);
/** /**
* 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.
*/ */
IBusText *ibus_text_new_from_unichar (gunichar c); IBusText *ibus_text_new_from_unichar (gunichar c);
skipping to change at line 193 skipping to change at line 193
* @text: An IBusText. * @text: An IBusText.
* @returns: the text in @text. * @returns: the text in @text.
* *
* Return the text in an IBusText. Should not be freed. * Return the text in an IBusText. Should not be freed.
*/ */
const gchar * ibus_text_get_text (IBusText *text); const gchar * ibus_text_get_text (IBusText *text);
/** /**
* ibus_text_get_attributes: * ibus_text_get_attributes:
* @text: An IBusText. * @text: An IBusText.
* @returns: the attrs in @text. * @returns: (transfer none): the attrs in @text.
* *
* Return the attributes in an IBusText. Should not be freed. * Return the attributes in an IBusText. Should not be freed.
*/ */
const IBusAttrList * IBusAttrList * ibus_text_get_attributes (IBusText *text);
ibus_text_get_attributes (IBusText *text);
/**
* ibus_text_set_attributes:
* @text: An IBusText.
* @attrs: An IBusAttrList
*/
void ibus_text_set_attributes (IBusText *text,
IBusAttrList *attrs)
;
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
4 lines changed or deleted 13 lines changed or added


 ibusversion.h   ibusversion.h 
skipping to change at line 52 skipping to change at line 52
* *
* IBus minor version. * IBus minor version.
*/ */
#define IBUS_MINOR_VERSION (4) #define IBUS_MINOR_VERSION (4)
/** /**
* IBUS_MICRO_VERSION: * IBUS_MICRO_VERSION:
* *
* IBus micro version. * IBus micro version.
*/ */
#define IBUS_MICRO_VERSION (0) #define IBUS_MICRO_VERSION (1)
/** /**
* IBUS_CHECK_VERSION: * IBUS_CHECK_VERSION:
* @major: Major version of ibus. * @major: Major version of ibus.
* @minor: Minor version of ibus. * @minor: Minor version of ibus.
* @micro: Micro version of ibus. * @micro: Micro version of ibus.
* *
* Check whether the current IBus version is equal to or greater than * Check whether the current IBus version is equal to or greater than
* given major.minor.micro. * given major.minor.micro.
*/ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

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