ibusattribute.h   ibusattribute.h 
skipping to change at line 133 skipping to change at line 133
* Returns GType of IBusAttribute. * Returns GType of IBusAttribute.
*/ */
GType ibus_attribute_get_type (); GType ibus_attribute_get_type ();
/** /**
* ibus_attribute_new: * ibus_attribute_new:
* @type: Type of the attribute. * @type: Type of the attribute.
* @value: Value of the attribute. * @value: Value of the attribute.
* @start_index: Where attribute starts. * @start_index: Where attribute starts.
* @end_index: Where attribute ends. * @end_index: Where attribute ends.
* @returns: A newly allocated IBusAttribute. * @returns: (transfer none): A newly allocated IBusAttribute.
* *
* New an IBusAttribute. * New an IBusAttribute.
*/ */
IBusAttribute *ibus_attribute_new (guint type, IBusAttribute *ibus_attribute_new (guint type,
guint value, guint value,
guint start_inde x, guint start_inde x,
guint end_index) ; guint end_index) ;
/** /**
* ibus_attribute_get_attr_type: * ibus_attribute_get_attr_type:
skipping to change at line 185 skipping to change at line 185
* Returns a end unsigned index * Returns a end unsigned index
*/ */
guint ibus_attribute_get_end_index guint ibus_attribute_get_end_index
(IBusAttribute *attr); (IBusAttribute *attr);
/** /**
* ibus_attr_underline_new: * ibus_attr_underline_new:
* @underline_type: Type of underline. * @underline_type: Type of underline.
* @start_index: Where attribute starts. * @start_index: Where attribute starts.
* @end_index: Where attribute ends. * @end_index: Where attribute ends.
* @returns: A newly allocated #IBusAttribute. * @returns: (transfer none): A newly allocated #IBusAttribute.
* *
* New an underline #IBusAttribute. * New an underline #IBusAttribute.
*/ */
IBusAttribute *ibus_attr_underline_new (guint underline_ type, IBusAttribute *ibus_attr_underline_new (guint underline_ type,
guint start_inde x, guint start_inde x,
guint end_index) ; guint end_index) ;
/** /**
* ibus_attr_foreground_new: * ibus_attr_foreground_new:
* @color: Color in RGB. * @color: Color in RGB.
* @start_index: Where attribute starts. * @start_index: Where attribute starts.
* @end_index: Where attribute ends. * @end_index: Where attribute ends.
* @returns: A newly allocated #IBusAttribute. * @returns: (transfer none): A newly allocated #IBusAttribute.
* *
* New an foreground #IBusAttribute. * New an foreground #IBusAttribute.
*/ */
IBusAttribute *ibus_attr_foreground_new (guint color, IBusAttribute *ibus_attr_foreground_new (guint color,
guint start_inde x, guint start_inde x,
guint end_index) ; guint end_index) ;
/** /**
* ibus_attr_background_new: * ibus_attr_background_new:
* @color: Color in RGB. * @color: Color in RGB.
* @start_index: Where attribute starts. * @start_index: Where attribute starts.
* @end_index: Where attribute ends. * @end_index: Where attribute ends.
* @returns: A newly allocated #IBusAttribute. * @returns: (transfer none): A newly allocated #IBusAttribute.
* *
* New an background #IBusAttribute. * New an background #IBusAttribute.
*/ */
IBusAttribute *ibus_attr_background_new (guint color, IBusAttribute *ibus_attr_background_new (guint color,
guint start_inde x, guint start_inde x,
guint end_index) ; guint end_index) ;
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 ibusbus.h   ibusbus.h 
skipping to change at line 105 skipping to change at line 105
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: %TRUE if @bus is connected, %FALSE otherwise. * @returns: %TRUE if @bus is connected, %FALSE otherwise.
* *
* Return %TRUE if @bus is connected to IBus daemon. * Return %TRUE if @bus is connected to IBus daemon.
*/ */
gboolean ibus_bus_is_connected (IBusBus *bus); gboolean ibus_bus_is_connected (IBusBus *bus);
/** /**
* ibus_bus_get_connection: * ibus_bus_get_connection:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: (transfer none): A #GDBusConnection of an #IBusIBus instance. * @returns: (transfer none): A #GDBusConnection of an #IBusBus instance.
* *
* Return #GDBusConnection of an #IBusIBus instance. * Return #GDBusConnection of an #IBusBus instance.
*/ */
GDBusConnection * GDBusConnection *
ibus_bus_get_connection (IBusBus *bus); ibus_bus_get_connection (IBusBus *bus);
/** /**
* ibus_bus_hello: * ibus_bus_hello:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: The unique name of #IBus process in DBus. * @returns: The unique name of IBus process in DBus.
* *
* 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.
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 ibuscomponent.h   ibuscomponent.h 
skipping to change at line 87 skipping to change at line 87
* IBusComponent: * IBusComponent:
* *
* An IBusComponent stores component information. * An IBusComponent stores component information.
* You can get extended values with g_object_get_properties. * You can get extended values with g_object_get_properties.
* name: Name of the component. * name: Name of the component.
* description: Detailed description of component. * description: Detailed description of component.
* version: Component version. * version: Component version.
* license: Distribution license of this component. * license: Distribution license of this component.
* author: Author(s) of the component. * author: Author(s) of the component.
* homepage: Homepage of the component. * homepage: Homepage of the component.
* exec: path to component executable. * command_line: path to component executable.
* textdomain: Domain name for dgettext() * textdomain: Domain name for dgettext()
*/ */
struct _IBusComponent { struct _IBusComponent {
/*< private >*/ /*< private >*/
IBusSerializable parent; IBusSerializable parent;
IBusComponentPrivate *priv; IBusComponentPrivate *priv;
/* instance members */ /* instance members */
/*< public >*/ /*< public >*/
skipping to change at line 118 skipping to change at line 118
GType ibus_component_get_type (void); GType ibus_component_get_type (void);
/** /**
* ibus_component_new: * ibus_component_new:
* @name: Name of the component. * @name: Name of the component.
* @description: Detailed description of component. * @description: Detailed description of component.
* @version: Component version. * @version: Component version.
* @license: Distribution license of this component. * @license: Distribution license of this component.
* @author: Author(s) of the component. * @author: Author(s) of the component.
* @homepage: Homepage of the component. * @homepage: Homepage of the component.
* @exec: path to component executable. * @command_line: path to component executable.
* @textdomain: Domain name for dgettext() * @textdomain: Domain name for dgettext()
* @returns: A newly allocated IBusComponent. * @returns: A newly allocated IBusComponent.
* *
* New an IBusComponent. * New an IBusComponent.
*/ */
IBusComponent *ibus_component_new (const gchar *name, IBusComponent *ibus_component_new (const gchar *name,
const gchar *descriptio n, const gchar *descriptio n,
const gchar *version, const gchar *version,
const gchar *license, const gchar *license,
const gchar *author, const gchar *author,
const gchar *homepage, const gchar *homepage,
const gchar *exec, const gchar *command_li ne,
const gchar *textdomain ); const gchar *textdomain );
/** /**
* ibus_component_new_varargs: * ibus_component_new_varargs:
* @first_property_name: Name of the first property. * @first_property_name: Name of the first property.
* @Varargs: the NULL-terminated arguments of the properties and values. * @Varargs: the NULL-terminated arguments of the properties and values.
* *
* New an IBusComponent. * New an IBusComponent.
* ibus_component_new_varargs() supports the va_list format. * ibus_component_new_varargs() supports the va_list format.
* name property is required. e.g. * name property is required. e.g.
* IBusComponent *component = ibus_component_new_varargs ("name", "ibus-foo ", * IBusComponent *component = ibus_component_new_varargs ("name", "ibus-foo ",
* "exec", "/usr/libexe c/ibus-engine-foo --ibus", * "command_line", " /usr/libexec/ibus-engine-foo --ibus",
* NULL) * NULL)
*/ */
IBusComponent *ibus_component_new_varargs (const gchar *first_prop erty_name, IBusComponent *ibus_component_new_varargs (const gchar *first_prop erty_name,
...); ...);
/** /**
* ibus_component_new_from_xml_node: * ibus_component_new_from_xml_node:
* @node: Root node of component XML tree. * @node: Root node of component XML tree.
* @returns: A newly allocated IBusComponent. * @returns: A newly allocated IBusComponent.
* *
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 ibusconfig.h   ibusconfig.h 
skipping to change at line 84 skipping to change at line 84
struct _IBusConfigClass { struct _IBusConfigClass {
IBusProxyClass parent; IBusProxyClass parent;
/* class members */ /* class members */
}; };
GType ibus_config_get_type (void); GType ibus_config_get_type (void);
/** /**
* ibus_config_new: * ibus_config_new:
* @connection: An GDBusConnection. * @connection: A #GDBusConnection.
* @returns: An newly allocated IBusConfig corresponding to @connection. * @returns: An newly allocated #IBusConfig corresponding to @connection.
* *
* New an #IBusConfig from existing GDBusConnection. * New an #IBusConfig from existing #GDBusConnection.
*/ */
IBusConfig *ibus_config_new (GDBusConnection *connection , IBusConfig *ibus_config_new (GDBusConnection *connection ,
GCancellable *cancellabl e, GCancellable *cancellabl e,
GError **error); GError **error);
/** /**
* ibus_config_new_async: * ibus_config_new_async:
* @connection: An #GDBusConnection. * @connection: An #GDBusConnection.
* @cancellable: A #GCancellable or %NULL. * @cancellable: A #GCancellable or %NULL.
* @callback: A #GAsyncReadyCallback to call when the request is satisfied. * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
* The callback should not be %NULL. * The callback should not be %NULL.
* @user_data: The data to pass to callback. * @user_data: The data to pass to callback.
* *
* New an #IBusContext asynchronously. * New an #IBusConfig asynchronously.
*/ */
void ibus_config_new_async (GDBusConnection *connection , void ibus_config_new_async (GDBusConnection *connection ,
GCancellable *cancellabl e, GCancellable *cancellabl e,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) ; gpointer user_data) ;
/** /**
* ibus_config_new_async_finish: * ibus_config_new_async_finish:
* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to
* ibus_config_new_async(). * ibus_config_new_async().
skipping to change at line 124 skipping to change at line 124
* @returns: A newly allocated #IBusConfig. * @returns: A newly allocated #IBusConfig.
* *
* Finishes an operation started with ibus_config_new_async(). * Finishes an operation started with ibus_config_new_async().
*/ */
IBusConfig *ibus_config_new_async_finish IBusConfig *ibus_config_new_async_finish
(GAsyncResult *res, (GAsyncResult *res,
GError **error); GError **error);
/** /**
* ibus_config_get_value: * ibus_config_get_value:
* @config: An IBusConfig * @config: An #IBusConfig
* @section: Section name of the configuration option. * @section: Section name of the configuration option.
* @name: Name of the configure option. * @name: Name of the configure option.
* @returns: A #GVariant or %NULL. Free with g_variant_unref(). * @returns: A #GVariant or %NULL. Free with g_variant_unref().
* *
* Get the value of a configuration option synchronously. * Get the value of a configuration option synchronously.
* *
* GConf stores configure options in a tree-like structure, * GConf stores configure options in a tree-like structure,
* and the IBus related setting is at /desktop/ibus, * and the IBus related setting is at /desktop/ibus,
* thus, @section here is a path from there, * thus, @section here is a path from there,
* while @name is the key of that configuration option. * while @name is the key of that configuration option.
* *
* ibus-chewing, for example, stores its setting in /desktop/ibus/engine/Ch ewing, * ibus-chewing, for example, stores its setting in /desktop/ibus/engine/Ch ewing,
* so the section name for it is "engine/Chewing". * so the section name for it is "engine/Chewing".
* @see_also: ibus_config_set_value. * See also: ibus_config_set_value().
*/ */
GVariant *ibus_config_get_value (IBusConfig *config, GVariant *ibus_config_get_value (IBusConfig *config,
const gchar *section, const gchar *section,
const gchar *name); const gchar *name);
/** /**
* ibus_config_get_value_async: * ibus_config_get_value_async:
* @config: An IBusConfig * @config: An #IBusConfig
* @section: Section name of the configuration option. * @section: Section name of the configuration option.
* @name: Name of the configure option. * @name: Name of the configure option.
* @timeout_msec: The timeout in milliseconds or -1 to use the default time out. * @timeout_ms: The timeout in milliseconds or -1 to use the default timeou t.
* @cancellable: A #GCancellable or %NULL. * @cancellable: A #GCancellable or %NULL.
* @callback: Callback function to invoke when the return value is ready. * @callback: Callback function to invoke when the return value is ready.
* @user_data: The data to pass to callback. * @user_data: The data to pass to callback.
* *
* Get the value of a configuration option asynchronously. * Get the value of a configuration option asynchronously.
* *
* @see_also: ibus_config_get_value. * See also: ibus_config_get_value().
*/ */
void ibus_config_get_value_async (IBusConfig *config, void ibus_config_get_value_async (IBusConfig *config,
const gchar *section, const gchar *section,
const gchar *name, const gchar *name,
gint timeout_m s, gint timeout_m s,
GCancellable *cancellab le, GCancellable *cancellab le,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data ); gpointer user_data );
/** /**
* ibus_config_get_value_async_finish: * ibus_config_get_value_async_finish:
* @confi: A #IBusConfig. * @config: A #IBusConfig.
* @result: A #GAsyncResult. * @result: A #GAsyncResult.
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: A #GVariant or %NULL if error is set. Free with g_variant_unre f(). * @returns: A #GVariant or %NULL if error is set. Free with g_variant_unre f().
* *
* Finish get value of a configuration option. * Finish get value of a configuration option.
* *
* @see_also: ibus_config_get_value_async. * See also: ibus_config_get_value_async().
*/ */
GVariant *ibus_config_get_value_async_finish GVariant *ibus_config_get_value_async_finish
(IBusConfig *config, (IBusConfig *config,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
/** /**
* ibus_config_get_values: * ibus_config_get_values:
* @config: An IBusConfig * @config: An #IBusConfig
* @section: Section name of the configuration option. * @section: Section name of the configuration option.
* @returns: A #GVariant or %NULL. Free with g_variant_unref(). * @returns: A #GVariant or %NULL. Free with g_variant_unref().
* *
* Get all values in a section synchronously. * Get all values in a section synchronously.
* *
* @see_also: ibus_config_set_value. * See also: ibus_config_set_value().
*/ */
GVariant *ibus_config_get_values (IBusConfig *config, GVariant *ibus_config_get_values (IBusConfig *config,
const gchar *section); const gchar *section);
/** /**
* ibus_config_get_values_async: * ibus_config_get_values_async:
* @config: An IBusConfig * @config: An #IBusConfig
* @section: Section name of the configuration option. * @section: Section name of the configuration option.
* @timeout_ms: The timeout in milliseconds or -1 to use the default timeou t. * @timeout_ms: The timeout in milliseconds or -1 to use the default timeou t.
* @cancellable: A #GCancellable or %NULL. * @cancellable: A #GCancellable or %NULL.
* @callback: Callback function to invoke when the return value is ready. * @callback: Callback function to invoke when the return value is ready.
* @user_data: The data to pass to callback. * @user_data: The data to pass to callback.
* *
* Get all values in a section asynchronously. * Get all values in a section asynchronously.
* *
* @see_also: ibus_config_get_values. * See also: ibus_config_get_values().
*/ */
void ibus_config_get_values_async(IBusConfig *config, void ibus_config_get_values_async(IBusConfig *config,
const gchar *section, const gchar *section,
gint timeout_m s, gint timeout_m s,
GCancellable *cancellab le, GCancellable *cancellab le,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data ); gpointer user_data );
/** /**
* ibus_config_get_values_async_finish: * ibus_config_get_values_async_finish:
* @config: A #IBusConfig. * @config: A #IBusConfig.
* @result: A #GAsyncResult. * @result: A #GAsyncResult.
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: A #GVariant or %NULL if error is set. Free with g_variant_unre f(). * @returns: A #GVariant or %NULL if error is set. Free with g_variant_unre f().
* *
* Finish get values in a section. * Finish get values in a section.
* *
* @see_also: ibus_config_get_values_async. * See also: ibus_config_get_values_async().
*/ */
GVariant *ibus_config_get_values_async_finish GVariant *ibus_config_get_values_async_finish
(IBusConfig *config, (IBusConfig *config,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
/** /**
* ibus_config_set_value: * ibus_config_set_value:
* @config: An IBusConfig * @config: An #IBusConfig
* @section: Section name of the configuration option. * @section: Section name of the configuration option.
* @name: Name of the configure option its self. * @name: Name of the configure option its self.
* @value: A #GVariant that holds the value. If the value is floating, the * @value: A #GVariant that holds the value. If the value is floating, the
* function takes ownership of it. * function takes ownership of it.
* @returns: TRUE if succeed; FALSE otherwise. * @returns: %TRUE if succeed; %FALSE otherwise.
* *
* Set the value of a configuration option synchronously. * Set the value of a configuration option synchronously.
* @see_also: ibus_config_get_value. * See also: ibus_config_get_value().
*/ */
gboolean ibus_config_set_value (IBusConfig *config, gboolean ibus_config_set_value (IBusConfig *config,
const gchar *section, const gchar *section,
const gchar *name, const gchar *name,
GVariant *value); GVariant *value);
/** /**
* ibus_config_set_value_async: * ibus_config_set_value_async:
* @config: An #IBusConfig * @config: An #IBusConfig
* @section: Section name of the configuration option. * @section: Section name of the configuration option.
* @name: Name of the configure option. * @name: Name of the configure option.
* @value: A #GVariant that holds the value. If the value is floating, the * @value: A #GVariant that holds the value. If the value is floating, the
* function takes ownership of it. * function takes ownership of it.
* @timeout_msec: The timeout in milliseconds or -1 to use the default time out. * @timeout_ms: The timeout in milliseconds or -1 to use the default timeou t.
* @cancellable: A #GCancellable or %NULL. * @cancellable: A #GCancellable or %NULL.
* @callback: Callback function to invoke when the return value is ready. * @callback: Callback function to invoke when the return value is ready.
* @user_data: The data to pass to callback. * @user_data: The data to pass to callback.
* *
* Set the value of a configuration option asynchronously. * Set the value of a configuration option asynchronously.
* *
* @see_also: ibus_config_set_value. * See also: ibus_config_set_value().
*/ */
void ibus_config_set_value_async (IBusConfig *config, void ibus_config_set_value_async (IBusConfig *config,
const gchar *section, const gchar *section,
const gchar *name, const gchar *name,
GVariant *value, GVariant *value,
gint timeout_m s, gint timeout_m s,
GCancellable *cancellab le, GCancellable *cancellab le,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data ); gpointer user_data );
/** /**
* ibus_config_set_value_async_finish: * ibus_config_set_value_async_finish:
* @confi: A #IBusConfig. * @config: A #IBusConfig.
* @result: A #GAsyncResult. * @result: A #GAsyncResult.
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: %TRUE or %FALSE if error is set. * @returns: %TRUE or %FALSE if error is set.
* *
* Finish set value of a configuration option. * Finish set value of a configuration option.
* *
* @see_also: ibus_config_set_value_async. * See also: ibus_config_set_value_async().
*/ */
gboolean ibus_config_set_value_async_finish gboolean ibus_config_set_value_async_finish
(IBusConfig *config, (IBusConfig *config,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
/** /**
* ibus_config_unset: * ibus_config_unset:
* @config: An IBusConfig * @config: An #IBusConfig
* @section: Section name of the configuration option. * @section: Section name of the configuration option.
* @name: Name of the configure option its self. * @name: Name of the configure option its self.
* @returns: TRUE if succeed; FALSE otherwise. * @returns: %TRUE if succeed; %FALSE otherwise.
* *
* Remove an entry of a configuration option. * Remove an entry of a configuration option.
* @see_also: ibus_config_get_value. * See also: ibus_config_get_value().
*/ */
gboolean ibus_config_unset (IBusConfig *config, gboolean ibus_config_unset (IBusConfig *config,
const gchar *section, const gchar *section,
const gchar *name); const gchar *name);
/* FIXME add an asynchronous version of unset */ /* FIXME add an asynchronous version of unset */
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 25 change blocks. 
26 lines changed or deleted 26 lines changed or added


 ibusengine.h   ibusengine.h 
skipping to change at line 161 skipping to change at line 161
/*< private >*/ /*< private >*/
/* padding */ /* padding */
gpointer pdummy[5]; gpointer pdummy[5];
}; };
GType ibus_engine_get_type (void); GType ibus_engine_get_type (void);
/** /**
* ibus_engine_new: * ibus_engine_new:
* @name: Name of the IBusObject. * @engine_name: Name of the IBusObject.
* @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 (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_with_type: * ibus_engine_new_with_type:
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ibusfactory.h   ibusfactory.h 
skipping to change at line 171 skipping to change at line 171
* @factory: An IBusFactory. * @factory: An IBusFactory.
* @engine_name: Name of an engine. * @engine_name: Name of an engine.
* @engine_type: GType of an engine. * @engine_type: GType of an engine.
* *
* Add an engine to the factory. * Add an engine to the factory.
*/ */
void ibus_factory_add_engine (IBusFactory *factory, void ibus_factory_add_engine (IBusFactory *factory,
const gchar *engine_nam e, const gchar *engine_nam e,
GType engine_typ e); GType engine_typ e);
/**
* ibus_factory_create_engine:
* @factory: An #IBusFactory.
* @engine_name: Name of an engine.
* @returns: (transfer full): #IBusEngine with @engine_name.
*
* Create an #IBusEngine with @engine_name.
*/
IBusEngine *ibus_factory_create_engine (IBusFactory *factory,
const gchar *engine_nam
e);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added


 ibushotkey.h   ibushotkey.h 
skipping to change at line 159 skipping to change at line 159
* @profile: An IBusHotkeyProfile. * @profile: An IBusHotkeyProfile.
* @keyval: Keycode of the hotkey. * @keyval: Keycode of the hotkey.
* @modifiers: Modifiers of the hotkey. * @modifiers: Modifiers of the hotkey.
* @prev_keyval: Keycode of the hotkey. * @prev_keyval: Keycode of the hotkey.
* @prev_modifiers: Modifiers of the hotkey. * @prev_modifiers: Modifiers of the hotkey.
* @user_data: user data for signal "trigger". * @user_data: user data for signal "trigger".
* @returns: 0 if releasing a hotkey and the hotkey is not in the profile ; an associated event otherwise. * @returns: 0 if releasing a hotkey and the hotkey is not in the profile ; an associated event otherwise.
* *
* Emit a <constant>::trigger</constant> signal when a hotkey is in a profi le. * Emit a <constant>::trigger</constant> signal when a hotkey is in a profi le.
* *
* @see_also: ::trigger * See also: ::trigger
*/ */
GQuark ibus_hotkey_profile_filter_key_event GQuark ibus_hotkey_profile_filter_key_event
(IBusHotkeyProfile *profil e, (IBusHotkeyProfile *profil e,
guint keyval , guint keyval ,
guint modifi ers, guint modifi ers,
guint prev_k eyval, guint prev_k eyval,
guint prev_m odifiers, guint prev_m odifiers,
gpointer user_d ata); gpointer user_d ata);
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ibusinputcontext.h   ibusinputcontext.h 
skipping to change at line 286 skipping to change at line 286
/** /**
* 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 and wait for the reply from ib us (i.e. synchronous IPC). * Pass the key event to input method engine and wait for the reply from ib us (i.e. synchronous IPC).
* *
* @see_also: ibus_input_context_process_key_event_async() * See also: ibus_input_context_process_key_event_async()
*/ */
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: * ibus_input_context_set_cursor_location:
* @context: An IBusInputContext. * @context: An IBusInputContext.
skipping to change at line 335 skipping to change at line 335
guint32 capabiliti es); guint32 capabiliti es);
/** /**
* ibus_input_context_property_activate * ibus_input_context_property_activate
* @context: An IBusInputContext. * @context: An IBusInputContext.
* @prop_name: A property name (e.g. "InputMode.WideLatin") * @prop_name: A property name (e.g. "InputMode.WideLatin")
* @state: A status of the property (e.g. PROP_STATE_CHECKED) * @state: A status of the property (e.g. PROP_STATE_CHECKED)
* *
* Activate the property asynchronously. * Activate the property asynchronously.
* *
* @see_also: #IBusEngine::property_activate * See also: #IBusEngine::property_activate
*/ */
void ibus_input_context_property_activate void ibus_input_context_property_activate
(IBusInputContext *context, (IBusInputContext *context,
const gchar *prop_name, const gchar *prop_name,
guint32 state); guint32 state);
/** /**
* ibus_input_context_focus_in: * ibus_input_context_focus_in:
* @context: An IBusInputContext. * @context: An IBusInputContext.
* *
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ibusserializable.h   ibusserializable.h 
skipping to change at line 32 skipping to change at line 32
#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION) #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
#error "Only <ibus.h> can be included directly" #error "Only <ibus.h> can be included directly"
#endif #endif
/** /**
* SECTION: ibusserializable * SECTION: ibusserializable
* @short_description: A serializable object. * @short_description: A serializable object.
* @stability: Stable * @stability: Stable
* *
* An IBusSerializable is an IBus object which can be serialized, that is, * An #IBusSerializable is an IBus object which can be serialized, that is,
* to be to and from an IBusMessage. * to be to and from a #GVariant.
* *
* This class is to be extended by other class that requires serialization. * This class is to be extended by other class that requires serialization.
* An extended class should overrides following methods: * An extended class should overrides following methods:
* <itemizedlist> * <itemizedlist>
* <listitem> * <listitem>
* <para><function>serialize(object,iter)</function>: for serialize.< /para> * <para><function>serialize(object,iter)</function>: for serialize.< /para>
* </listitem> * </listitem>
* <listitem> * <listitem>
* <para><function>deserialize(object,iter)</function>: for deseriali ze.</para> * <para><function>deserialize(object,iter)</function>: for deseriali ze.</para>
* </listitem> * </listitem>
skipping to change at line 88 skipping to change at line 88
* @v: Value to be attached. Should be also serializable. * @v: Value to be attached. Should be also serializable.
* *
* Attach a value to an IBusSerializable. * Attach a value to an IBusSerializable.
* This macro is an convenient wrapper of ibus_serializable_set_qattachment (). * This macro is an convenient wrapper of ibus_serializable_set_qattachment ().
*/ */
#define ibus_serializable_set_attachment(o, k, v) \ #define ibus_serializable_set_attachment(o, k, v) \
ibus_serializable_set_qattachment (o, g_quark_from_string (k), v) ibus_serializable_set_qattachment (o, g_quark_from_string (k), v)
/** /**
* ibus_serializable_get_attachment: * ibus_serializable_get_attachment:
* @o: An IBusSerializable. * @o: An #IBusSerializable.
* @k: String formatted key for indexing value. * @k: String formatted key for indexing value.
* *
* Get a value from attachment of an IBusSerializable. * Get a value from attachment of an #IBusSerializable.
* This macro is an convenient wrapper of ibus_serializable_get_qattachment (). * This macro is an convenient wrapper of ibus_serializable_get_qattachment ().
*/ */
#define ibus_serializable_get_attachment(o, k) \ #define ibus_serializable_get_attachment(o, k) \
ibus_serializable_get_qattachment (o, g_quark_from_string (k)) ibus_serializable_get_qattachment (o, g_quark_from_string (k))
/** /**
* ibus_serializable_remove_attachment: * ibus_serializable_remove_attachment:
* @o: An IBusSerializable. * @o: An #IBusSerializable.
* @k: String formatted key for indexing value. * @k: String formatted key for indexing value.
* *
* Remove a value from attachment of an IBusSerializable. * Remove a value from attachment of an #IBusSerializable.
* This macro is an convenient wrapper of ibus_serializable_remove_qattachm ent(). * This macro is an convenient wrapper of ibus_serializable_remove_qattachm ent().
*/ */
#define ibus_serializable_remove_attachment(o, k) \ #define ibus_serializable_remove_attachment(o, k) \
ibus_serializable_remove_qattachment (o, g_quark_from_string (k)) ibus_serializable_remove_qattachment (o, g_quark_from_string (k))
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _IBusSerializable IBusSerializable; typedef struct _IBusSerializable IBusSerializable;
typedef struct _IBusSerializableClass IBusSerializableClass; typedef struct _IBusSerializableClass IBusSerializableClass;
typedef struct _IBusSerializablePrivate IBusSerializablePrivate; typedef struct _IBusSerializablePrivate IBusSerializablePrivate;
skipping to change at line 134 skipping to change at line 134
/* instance members */ /* instance members */
}; };
/** /**
* IBusSerializableSerializeFunc: * IBusSerializableSerializeFunc:
* @serializable: An #IBusSerializable. * @serializable: An #IBusSerializable.
* @builder: A #GVariantBuilder. * @builder: A #GVariantBuilder.
* @returns: %TRUE if succeed; %FALSE otherwise. * @returns: %TRUE if succeed; %FALSE otherwise.
* *
* Prototype of serialize function. * Prototype of serialize function.
* Serialize function convert an IBusSerializable to IBusMessageIter. * Serialize function convert an #IBusSerializable to #GVariantBuilder.
* Returns a gboolean value which indicates whether the conversion is succe ss. * Returns a gboolean value which indicates whether the conversion is succe ss.
* Return %TRUE if succeed. * Return %TRUE if succeed.
*/ */
typedef gboolean (* IBusSerializableSerializeFunc) (IBusSerializable *serializable, typedef gboolean (* IBusSerializableSerializeFunc) (IBusSerializable *serializable,
GVariantBuilder *builder); GVariantBuilder *builder);
/** /**
* IBusSerializableDeserializeFunc: * IBusSerializableDeserializeFunc:
* @serializable: An #IBusSerializable. * @serializable: An #IBusSerializable.
* @variant: A #GVariant contains a tuple. * @variant: A #GVariant contains a tuple.
* @returns: The number of values in the variant(tuple) are consumed. * @returns: The number of values in the variant(tuple) are consumed.
* *
* Prototype of deserialize function. * Prototype of deserialize function.
* Deserialize function convert an IBusMessageIter to IBusSerializable. * Deserialize function convert a #GVariant to #IBusSerializable.
* Returns an integer value which indicates how many values in * Returns an integer value which indicates how many values in
* the variant(tuple) are consumed. * the variant(tuple) are consumed.
*/ */
typedef gint (* IBusSerializableDeserializeFunc) (IBusSerializable *serializable, typedef gint (* IBusSerializableDeserializeFunc) (IBusSerializable *serializable,
GVariant *variant); GVariant *variant);
/** /**
* IBusSerializableCopyFunc: * IBusSerializableCopyFunc:
* @dest: The destination #IBusSerializable. * @dest: The destination #IBusSerializable.
* @src: A source #IBusMessageIter. * @src: A source #IBusSerializable.
* @returns: %TRUE if succeed; %FALSE otherwise. * @returns: %TRUE if succeed; %FALSE otherwise.
* *
* Prototype of copy function. * Prototype of copy function.
* Copy function copy from source #IBusSerializable to the destination one. * Copy function copy from source #IBusSerializable to the destination one.
* Returns a gboolean value which indicates whether the copying is success. * Returns a gboolean value which indicates whether the copying is success.
*/ */
typedef gboolean (* IBusSerializableCopyFunc) (IBusSerializable *dest, typedef gboolean (* IBusSerializableCopyFunc) (IBusSerializable *dest,
const IBusSerializ able *src); const IBusSerializ able *src);
struct _IBusSerializableClass { struct _IBusSerializableClass {
/*< private >*/ /*< private >*/
skipping to change at line 200 skipping to change at line 200
* Returns: a new instance of #IBusSerializable. * Returns: a new instance of #IBusSerializable.
*/ */
IBusSerializable *ibus_serializable_new (void); IBusSerializable *ibus_serializable_new (void);
/** /**
* ibus_serializable_set_qattachment: * ibus_serializable_set_qattachment:
* @serializable: An #IBusSerializable. * @serializable: An #IBusSerializable.
* @key: String formatted key for indexing value. * @key: String formatted key for indexing value.
* @value: Value to be attached or %NULL to remove any prevoius value. * @value: Value to be attached or %NULL to remove any prevoius value.
* *
* Attach a value to an IBusSerializable. If the value is floating, * Attach a value to an #IBusSerializable. If the value is floating,
* the serializable will take the ownership. * the serializable will take the ownership.
* *
* @see_also: ibus_serializable_set_attachment(). * See also: ibus_serializable_set_attachment().
*/ */
void ibus_serializable_set_qattachment (IBusSerializable *serializable, void ibus_serializable_set_qattachment (IBusSerializable *serializable,
GQuark key, GQuark key,
GVariant *value); GVariant *value);
/** /**
* ibus_serializable_get_qattachment: * ibus_serializable_get_qattachment:
* @serializable: An #IBusSerializable. * @serializable: An #IBusSerializable.
* @key: String formatted key for indexing value. * @key: String formatted key for indexing value.
* @returns: The attached value; or %NULL if fail to retrieve the value. * @returns: The attached value; or %NULL if fail to retrieve the value.
* *
* Get a value from attachment of an #IBusSerializable. * Get a value from attachment of an #IBusSerializable.
* @see_also: ibus_serializable_set_attachment(). * See also: ibus_serializable_set_attachment().
*/ */
GVariant *ibus_serializable_get_qattachment (IBusSerializable *serializable, GVariant *ibus_serializable_get_qattachment (IBusSerializable *serializable,
GQuark key); GQuark key);
/** /**
* ibus_serializable_remove_qattachment: * ibus_serializable_remove_qattachment:
* @serializable: An #IBusSerializable. * @serializable: An #IBusSerializable.
* @key: String formatted key for indexing value. * @key: String formatted key for indexing value.
* *
* Remove a value from attachment of an #IBusSerializable. * Remove a value from attachment of an #IBusSerializable.
* @see_also: ibus_serializable_remove_attachment(). * See also: ibus_serializable_remove_attachment().
*/ */
void ibus_serializable_remove_qattachment void ibus_serializable_remove_qattachment
(IBusSerializable *serializable, (IBusSerializable *serializable,
GQuark key); GQuark key);
/** /**
* ibus_serializable_copy: * ibus_serializable_copy:
* @serializable: An #IBusSerializable. * @serializable: An #IBusSerializable.
* @returns: A newly allocated clone object; or %NULL if @object is not ser ializable. * @returns: A newly allocated clone object; or %NULL if @object is not ser ializable.
* *
* Clone an #IBusSerializable. * Clone an #IBusSerializable.
* The copy method should be implemented in extended class. * The copy method should be implemented in extended class.
* *
* @see_also: IBusSerializableCopyFunc(). * See also: IBusSerializableCopyFunc().
*/ */
IBusSerializable *ibus_serializable_copy (IBusSerializable *serializable); IBusSerializable *ibus_serializable_copy (IBusSerializable *serializable);
/** /**
* ibus_serializable_serialize: * ibus_serializable_serialize:
* @serializable: An #IBusSerializable. * @serializable: An #IBusSerializable.
* @returns: A #GVariant. * @returns: A #GVariant.
* *
* Serialize an #IBusSerializable to a #GVariant. * Serialize an #IBusSerializable to a #GVariant.
* The serialize method should be implemented in extended class. * The serialize method should be implemented in extended class.
* *
* @see_also: IBusSerializableCopyFunc(). * See also: IBusSerializableCopyFunc().
*/ */
GVariant *ibus_serializable_serialize (IBusSerializable *serializable); GVariant *ibus_serializable_serialize (IBusSerializable *serializable);
/** /**
* ibus_serializable_deserialize: * ibus_serializable_deserialize:
* @variant: A #GVariant. * @variant: A #GVariant.
* @returns: The deserialized #IBusSerializable. * @returns: The deserialized #IBusSerializable.
* *
* Deserialize a #GVariant to an #IBusSerializable/ * Deserialize a #GVariant to an #IBusSerializable/
* The deserialize method should be implemented in extended class. * The deserialize method should be implemented in extended class.
* *
* @see_also: IBusSerializableCopyFunc(). * See also: IBusSerializableCopyFunc().
*/ */
IBusSerializable *ibus_serializable_deserialize (GVariant *variant); IBusSerializable *ibus_serializable_deserialize (GVariant *variant);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 15 change blocks. 
16 lines changed or deleted 16 lines changed or added


 ibusshare.h   ibusshare.h 
skipping to change at line 191 skipping to change at line 191
* ibus_get_address: * ibus_get_address:
* @returns: D-Bus address of IBus. %NULL for not found. * @returns: D-Bus address of IBus. %NULL for not found.
* *
* Return the D-Bus address of IBus. * Return the D-Bus address of IBus.
* It will find the address from following source: * It will find the address from following source:
* <orderedlist> * <orderedlist>
* <listitem><para>Environment variable IBUS_ADDRESS</para></listitem> * <listitem><para>Environment variable IBUS_ADDRESS</para></listitem>
* <listitem><para>Socket file under ~/.config/ibus/bus/</para></listite m> * <listitem><para>Socket file under ~/.config/ibus/bus/</para></listite m>
* </orderedlist> * </orderedlist>
* *
* @see_also: ibus_write_address(). * See also: ibus_write_address().
*/ */
const gchar *ibus_get_address (void); const gchar *ibus_get_address (void);
/** /**
* ibus_write_address: * ibus_write_address:
* @address: D-Bus address of IBus. * @address: D-Bus address of IBus.
* *
* Write D-Bus address to socket file. * Write D-Bus address to socket file.
* *
* @see_also: ibus_get_address(). * See also: ibus_get_address().
*/ */
void ibus_write_address (const gchar *address); void ibus_write_address (const gchar *address);
/** /**
* ibus_get_user_name: * ibus_get_user_name:
* @returns: A newly allocated string that stores current user name. * @returns: A newly allocated string that stores current user name.
* *
* Get the current user name. * Get the current user name.
* It is determined by: * It is determined by:
* <orderedlist> * <orderedlist>
skipping to change at line 305 skipping to change at line 305
* *
* It is actually a wrapper of g_type_init(). * It is actually a wrapper of g_type_init().
*/ */
void ibus_init (void); void ibus_init (void);
/** /**
* ibus_main: * ibus_main:
* *
* Runs an IBus main loop until ibus_quit() is called in the loop. * Runs an IBus main loop until ibus_quit() is called in the loop.
* *
* @see_also: ibus_quit(). * See also: ibus_quit().
*/ */
void ibus_main (void); void ibus_main (void);
/** /**
* ibus_quit: * ibus_quit:
* *
* Stops an IBus from running. * Stops an IBus from running.
* *
* Any calls to ibus_quit() for the loop will return. * Any calls to ibus_quit() for the loop will return.
* @see_also: ibus_main(). * See also: ibus_main().
*/ */
void ibus_quit (void); void ibus_quit (void);
/** /**
* ibus_set_log_handler: * ibus_set_log_handler:
* @verbose: TRUE for verbose logging. * @verbose: TRUE for verbose logging.
* *
* Sets GLIB's log handler to ours. Our log handler adds time info * Sets GLIB's log handler to ours. Our log handler adds time info
* including hour, minute, second, and microsecond, like: * including hour, minute, second, and microsecond, like:
* *
* (ibus-daemon:7088): IBUS-DEBUG: 18:06:45.822819: ibus-daemon started * (ibus-daemon:7088): IBUS-DEBUG: 18:06:45.822819: ibus-daemon started
* *
* If @verbose is TRUE, all levels of messages will be logged. Otherwise, * If @verbose is %TRUE, all levels of messages will be logged. Otherwise,
* DEBUG and WARNING messages will be ignored. The function is used in * DEBUG and WARNING messages will be ignored. The function is used in
* ibus-daemon, but can be useful for IBus client programs as well for * ibus-daemon, but can be useful for IBus client programs as well for
* debugging. It's totally fine for not calling this function. If you * debugging. It's totally fine for not calling this function. If you
* don't set a custom GLIB log handler, the default GLIB log handler will * don't set a custom GLIB log handler, the default GLIB log handler will
* be used. * be used.
*/ */
void ibus_set_log_handler (gboolean verbose); void ibus_set_log_handler (gboolean verbose);
/**
* ibus_unset_log_handler:
*
* Remove the log handler which is set by ibus_set_log_handler.
*/
void ibus_unset_log_handler (void);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 6 change blocks. 
5 lines changed or deleted 12 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 (1) #define IBUS_MICRO_VERSION (2)
/** /**
* 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/