ibuscomponent.h   ibuscomponent.h 
skipping to change at line 98 skipping to change at line 98
* 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 >*/
/*< private >*/
/* engines */
GList *engines;
/* observed paths */
GList *observed_paths;
GPid pid;
guint child_source_id;
/* padding */ /* padding */
gpointer pdummy[5]; // We can add 5 pointers without breaking the ABI. gpointer pdummy[7]; // We can add 7 pointers without breaking the ABI.
}; };
struct _IBusComponentClass { struct _IBusComponentClass {
IBusSerializableClass parent; IBusSerializableClass parent;
/* class members */ /* class members */
}; };
GType ibus_component_get_type (void); GType ibus_component_get_type (void);
skipping to change at line 144 skipping to change at line 134
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 *exec,
const gchar *textdomain ); const gchar *textdomain );
/** /**
* ibus_component_new2: * 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_new2() 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_new2 ("name", "ibus-foo", * IBusComponent *component = ibus_component_new_varargs ("name", "ibus-foo
* "exec", "/usr/libexec/ib ",
us-engine-foo --ibus", * "exec", "/usr/libexe
* NULL) c/ibus-engine-foo --ibus",
* NULL)
*/ */
IBusComponent *ibus_component_new2 (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.
* *
* New an IBusComponent from an XML tree. * New an IBusComponent from an XML tree.
*/ */
IBusComponent *ibus_component_new_from_xml_node IBusComponent *ibus_component_new_from_xml_node
skipping to change at line 319 skipping to change at line 309
/** /**
* ibus_component_check_modification: * ibus_component_check_modification:
* @component: An IBusComponent. * @component: An IBusComponent.
* @returns: TRUE if at least one of the observed paths is modified; FALSE otherwise. * @returns: TRUE if at least one of the observed paths is modified; FALSE otherwise.
* *
* Check whether the observed paths of component is modified. * Check whether the observed paths of component is modified.
*/ */
gboolean ibus_component_check_modification gboolean ibus_component_check_modification
(IBusComponent *component) ; (IBusComponent *component) ;
/**
* ibus_component_start:
* @component: An IBusComponent.
* @verbose: if FALSE, redirect the child output to /dev/null
* @returns: TRUE if the component is started; FALSE otherwise.
*
* Whether the IBusComponent is started.
*/
gboolean ibus_component_start (IBusComponent *component,
gboolean verbose);
/**
* ibus_component_stop:
* @component: An IBusComponent.
* @returns: TRUE if the component is stopped; FALSE otherwise.
*
* Whether the IBusComponent is stopped.
*/
gboolean ibus_component_stop (IBusComponent *component)
;
/**
* ibus_component_is_running:
* @component: An IBusComponent.
* @returns: TRUE if the component is running; FALSE otherwise.
*
* Whether the IBusComponent is running.
*/
gboolean ibus_component_is_running (IBusComponent *component)
;
/**
* ibus_component_get_from_engine:
* @engine: A description of an engine.
* @returns: (transfer none): An IBusComponent of the engine.
*
* Get the IBusComponent from an engine description.
*/
IBusComponent *ibus_component_get_from_engine (IBusEngineDesc *engine);
/**
* ibus_component_set_restart:
* @component: An IBusComponent.
* @restart: if TRUE, the component will be restartd when it dies.
*
* Set whether the component needs to be restarted when it dies.
*/
void ibus_component_set_restart (IBusComponent *component,
gboolean restart);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 7 change blocks. 
69 lines changed or deleted 9 lines changed or added


 ibusconfig.h   ibusconfig.h 
skipping to change at line 98 skipping to change at line 98
*/ */
IBusConfig *ibus_config_new (GDBusConnection *connection , IBusConfig *ibus_config_new (GDBusConnection *connection ,
GCancellable *cancellabl e, GCancellable *cancellabl e,
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. * @returns: A #GVariant or %NULL. Free with g_variant_unref().
* *
* Get the value of a configuration option. * Get the value of a configuration option.
* *
* 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:
* @config: An IBusConfig
* @section: Section name of the configuration option.
* @name: Name of the configure option.
* @cancellable: A #GCancellable or %NULL.
* @callback: Callback function to invoke when the return value is ready.
*
* Get the value of a configuration option.
*
* @see_also: ibus_config_get_value.
*/
void ibus_config_get_value_async(IBusConfig *config,
const gchar *section,
const gchar *name,
GCancellable *cancellabl
e,
GAsyncReadyCallback callback,
gpointer user_data)
;
/**
* ibus_config_get_value_async_finish:
* @confi: A #IBusConfig.
* @result: A #GAsyncResult.
* @error: Return location for error or %NULL.
* @returns: A #GVariant or %NULL if error is set. Free with g_variant_unre
f().
*
* Finish get value of a configuration option.
*
* @see_also: ibus_config_get_value_async.
*/
GVariant *ibus_config_get_value_async_finish
(IBusConfig *config,
GAsyncResult *result,
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: GValue that holds the value. * @value: A #GVariant that holds the value.
* @returns: TRUE if succeed; FALSE otherwise. * @returns: TRUE if succeed; FALSE otherwise.
* *
* Set the value of a configuration option. * Set the value of a configuration option.
* @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:
* @config: An #IBusConfig
* @section: Section name of the configuration option.
* @name: Name of the configure option.
* @value: A #GVariant that holds the value.
* @cancellable: A #GCancellable or %NULL.
* @callback: Callback function to invoke when the return value is ready.
*
* Set the value of a configuration option.
*
* @see_also: ibus_config_set_value.
*/
void ibus_config_set_value_async(IBusConfig *config,
const gchar *section,
const gchar *name,
GVariant *value,
GCancellable *cancellabl
e,
GAsyncReadyCallback callback,
gpointer user_data)
;
/**
* ibus_config_set_value_async_finish:
* @confi: A #IBusConfig.
* @result: A #GAsyncResult.
* @error: Return location for error or %NULL.
* @returns: %TRUE or %FALSE if error is set.
*
* Finish set value of a configuration option.
*
* @see_also: ibus_config_set_value_async.
*/
gboolean ibus_config_set_value_async_finish
(IBusConfig *config,
GAsyncResult *result,
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,
 End of changes. 4 change blocks. 
2 lines changed or deleted 79 lines changed or added


 ibusenginedesc.h   ibusenginedesc.h 
skipping to change at line 75 skipping to change at line 75
#define IBUS_IS_ENGINE_DESC_CLASS(klass) \ #define IBUS_IS_ENGINE_DESC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_ENGINE_DESC)) (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_ENGINE_DESC))
#define IBUS_ENGINE_DESC_GET_CLASS(obj) \ #define IBUS_ENGINE_DESC_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_ENGINE_DESC, IBusEngineDes cClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_ENGINE_DESC, IBusEngineDes cClass))
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _IBusEngineDesc IBusEngineDesc; typedef struct _IBusEngineDesc IBusEngineDesc;
typedef struct _IBusEngineDescPrivate IBusEngineDescPrivate; typedef struct _IBusEngineDescPrivate IBusEngineDescPrivate;
typedef struct _IBusEngineDescClass IBusEngineDescClass; typedef struct _IBusEngineDescClass IBusEngineDescClass;
typedef struct _BusComponent BusComponent;
/** /**
* IBusEngineDesc: * IBusEngineDesc:
* *
* Input method engine description data. * Input method engine description data.
* You can get extended values with g_object_get_properties. * You can get extended values with g_object_get_properties.
* name: Name of the engine. * name: Name of the engine.
* longname: Long name of the input method engine. * longname: Long name of the input method engine.
* description: Input method engine description. * description: Input method engine description.
* language: Language (e.g. zh, jp) supported by this input method engine. * language: Language (e.g. zh, jp) supported by this input method engine.
skipping to change at line 135 skipping to change at line 134
IBusEngineDesc *ibus_engine_desc_new (const gchar *name, IBusEngineDesc *ibus_engine_desc_new (const gchar *name,
const gchar *longname, const gchar *longname,
const gchar *descriptio n, const gchar *descriptio n,
const gchar *language, const gchar *language,
const gchar *license, const gchar *license,
const gchar *author, const gchar *author,
const gchar *icon, const gchar *icon,
const gchar *layout); const gchar *layout);
/** /**
* ibus_engine_desc_new2: * ibus_engine_desc_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 a IBusEngineDesc. * New a IBusEngineDesc.
* ibus_engine_desc_new2() supports the va_list format. * ibus_engine_desc_new_varargs() supports the va_list format.
* name property is required. e.g. * name property is required. e.g.
* ibus_engine_desc_new2("name", "ibus-foo", "language", "us", NULL) * ibus_engine_desc_new_varargs("name", "ibus-foo", "language", "us", NULL)
*/ */
IBusEngineDesc *ibus_engine_desc_new2 (const gchar *first_propert y_name, IBusEngineDesc *ibus_engine_desc_new_varargs (const gchar *first_propert y_name,
...); ...);
/** /**
* ibus_engine_desc_new_from_xml_node: * ibus_engine_desc_new_from_xml_node:
* @node: An XML node * @node: An XML node
* @returns: A newly allocated IBusEngineDesc that contains description fro m * @returns: A newly allocated IBusEngineDesc that contains description fro m
* @node. * @node.
* *
* New a IBusEngineDesc from an XML node. * New a IBusEngineDesc from an XML node.
* <note><para>This function is called by ibus_component_new_from_file(), * <note><para>This function is called by ibus_component_new_from_file(),
 End of changes. 5 change blocks. 
5 lines changed or deleted 4 lines changed or added


 ibusobject.h   ibusobject.h 
skipping to change at line 70 skipping to change at line 70
typedef enum { typedef enum {
IBUS_IN_DESTRUCTION = (1 << 0), IBUS_IN_DESTRUCTION = (1 << 0),
IBUS_DESTROYED = (1 << 1), IBUS_DESTROYED = (1 << 1),
IBUS_RESERVED_1 = (1 << 2), IBUS_RESERVED_1 = (1 << 2),
IBUS_RESERVED_2 = (1 << 3), IBUS_RESERVED_2 = (1 << 3),
} IBusObjectFlags; } IBusObjectFlags;
#define IBUS_OBJECT_FLAGS(obj) (IBUS_OBJECT (obj)->flags) #define IBUS_OBJECT_FLAGS(obj) (IBUS_OBJECT (obj)->flags)
#define IBUS_OBJECT_SET_FLAGS(obj,flag) G_STMT_START{ (IBUS_OBJECT_FLAGS (obj) |= (flag)); }G_STMT_END #define IBUS_OBJECT_SET_FLAGS(obj,flag) G_STMT_START{ (IBUS_OBJECT_FLAGS (obj) |= (flag)); }G_STMT_END
#define IBUS_OBJECT_UNSET_FLAGS(obj,flag) G_STMT_START{ (IBUS_OBJECT_FLAGS (obj) &= ~(flag)); }G_STMT_END #define IBUS_OBJECT_UNSET_FLAGS(obj,flag) G_STMT_START{ (IBUS_OBJECT_FLAGS (obj) &= ~(flag)); }G_STMT_END
#define IBUS_OBJECT_IN_DESTRUCTION(obj) (IBUS_OBJECT_FLAGS (obj) & IBUS_ IN_DESTRUCTION)
#define IBUS_OBJECT_DESTROYED(obj) (IBUS_OBJECT_FLAGS (obj) & IBUS_ DESTROYED) #define IBUS_OBJECT_DESTROYED(obj) (IBUS_OBJECT_FLAGS (obj) & IBUS_ DESTROYED)
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _IBusObject IBusObject; typedef struct _IBusObject IBusObject;
typedef struct _IBusObjectClass IBusObjectClass; typedef struct _IBusObjectClass IBusObjectClass;
typedef struct _IBusObjectPrivate IBusObjectPrivate; typedef struct _IBusObjectPrivate IBusObjectPrivate;
/** /**
* IBusObject: * IBusObject:
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ibuspanelservice.h   ibuspanelservice.h 
skipping to change at line 103 skipping to change at line 103
IBusLookupTable *lookup_ table, IBusLookupTable *lookup_ table,
gboolean visible ); gboolean visible );
void (* update_preedit_text) (IBusPanelService *panel, void (* update_preedit_text) (IBusPanelService *panel,
IBusText *text, IBusText *text,
guint cursor_p os, guint cursor_p os,
gboolean visible) ; gboolean visible) ;
void (* update_property) (IBusPanelService *panel, void (* update_property) (IBusPanelService *panel,
IBusProperty *prop); IBusProperty *prop);
void (* cursor_down_lookup_table) (IBusPanelService *panel); void (* cursor_down_lookup_table) (IBusPanelService *panel);
void (* cursor_up_lookup_table) (IBusPanelService *panel); void (* cursor_up_lookup_table) (IBusPanelService *panel);
void (* destroy) (IBusPanelService *panel);
void (* hide_auxiliary_text) (IBusPanelService *panel); void (* hide_auxiliary_text) (IBusPanelService *panel);
void (* hide_language_bar) (IBusPanelService *panel); void (* hide_language_bar) (IBusPanelService *panel);
void (* hide_lookup_table) (IBusPanelService *panel); void (* hide_lookup_table) (IBusPanelService *panel);
void (* hide_preedit_text) (IBusPanelService *panel); void (* hide_preedit_text) (IBusPanelService *panel);
void (* page_down_lookup_table) (IBusPanelService *panel); void (* page_down_lookup_table) (IBusPanelService *panel);
void (* page_up_lookup_table) (IBusPanelService *panel); void (* page_up_lookup_table) (IBusPanelService *panel);
void (* reset) (IBusPanelService *panel); void (* reset) (IBusPanelService *panel);
void (* show_auxiliary_text) (IBusPanelService *panel); void (* show_auxiliary_text) (IBusPanelService *panel);
void (* show_language_bar) (IBusPanelService *panel); void (* show_language_bar) (IBusPanelService *panel);
void (* show_lookup_table) (IBusPanelService *panel); void (* show_lookup_table) (IBusPanelService *panel);
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 ibusproxy.h   ibusproxy.h 
skipping to change at line 93 skipping to change at line 93
struct _IBusProxyClass { struct _IBusProxyClass {
GDBusProxyClass parent; GDBusProxyClass parent;
/* class members */ /* class members */
void (* destroy) (IBusProxy *proxy); void (* destroy) (IBusProxy *proxy);
/*< private >*/ /*< private >*/
/* padding */ /* padding */
gpointer pdummy[7]; gpointer pdummy[7];
}; };
GType ibus_proxy_get_type (void); GType ibus_proxy_get_type (void);
void ibus_proxy_destroy (IBusProxy *proxy); void ibus_proxy_destroy (IBusProxy *proxy);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/