ibus.h   ibus.h 
/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
/* vim:set et sts=4: */ /* vim:set et sts=4: */
/* ibus - The Input Bus /* ibus - The Input Bus
* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com> * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
* Copyright (C) 2008-2010 Red Hat, Inc. * Copyright (C) 2008-2013 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 58 skipping to change at line 58
#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> #include <ibusutil.h>
#include <ibusregistry.h>
#ifndef IBUS_DISABLE_DEPRECATED #ifndef IBUS_DISABLE_DEPRECATED
#include <ibuskeysyms-compat.h> #include <ibuskeysyms-compat.h>
#endif #endif
#undef __IBUS_H_INSIDE__ #undef __IBUS_H_INSIDE__
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 ibusbus.h   ibusbus.h 
/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
/* vim:set et sts=4: */ /* vim:set et sts=4: */
/* ibus - The Input Bus /* ibus - The Input Bus
* Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com> * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
* Copyright (C) 2008-2010 Red Hat, Inc. * Copyright (C) 2008-2013 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 38 skipping to change at line 38
#define __IBUS_BUS_H_ #define __IBUS_BUS_H_
/** /**
* SECTION: ibusbus * SECTION: ibusbus
* @short_description: Connect with IBus daemon. * @short_description: Connect with IBus daemon.
* @stability: Stable * @stability: Stable
* *
* An IBusBus connects with IBus daemon. * An IBusBus connects with IBus daemon.
*/ */
#include <gio/gio.h> #include <gio/gio.h>
#include <glib.h>
#include "ibusinputcontext.h" #include "ibusinputcontext.h"
#include "ibusconfig.h" #include "ibusconfig.h"
#include "ibuscomponent.h" #include "ibuscomponent.h"
#include "ibusshare.h"
/* /*
* Type macros. * Type macros.
*/ */
/* define GOBJECT macros */ /* define GOBJECT macros */
#define IBUS_TYPE_BUS \ #define IBUS_TYPE_BUS \
(ibus_bus_get_type ()) (ibus_bus_get_type ())
#define IBUS_BUS(obj) \ #define IBUS_BUS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_BUS, IBusBus)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_BUS, IBusBus))
skipping to change at line 678 skipping to change at line 680
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: (transfer container) (element-type IBusEngineDesc): A List of engines. * @returns: (transfer container) (element-type IBusEngineDesc): A List of engines.
* *
* Finishes an operation started with ibus_bus_list_engines_async(). * Finishes an operation started with ibus_bus_list_engines_async().
*/ */
GList *ibus_bus_list_engines_async_finish GList *ibus_bus_list_engines_async_finish
(IBusBus *bus, (IBusBus *bus,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
#ifndef IBUS_DISABLE_DEPRECATED
/** /**
* ibus_bus_list_active_engines: * ibus_bus_list_active_engines:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: (transfer container) (element-type IBusEngineDesc): A List of active engines. * @returns: (transfer container) (element-type IBusEngineDesc): A List of active engines.
* *
* List active engines synchronously. * List active engines synchronously.
*
* Deprecated: 1.5.3: Read dconf value
* /desktop/ibus/general/preload-engines instead.
*/ */
IBUS_DEPRECATED
GList *ibus_bus_list_active_engines GList *ibus_bus_list_active_engines
(IBusBus *bus); (IBusBus *bus);
/** /**
* ibus_bus_list_active_engines_async: * ibus_bus_list_active_engines_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.
* @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.
* @user_data: The data to pass to callback. * @user_data: The data to pass to callback.
* *
* List active engines asynchronously. * List active engines asynchronously.
*
* Deprecated: 1.5.3: Read dconf value
* /desktop/ibus/general/preload-engines instead.
*/ */
IBUS_DEPRECATED
void ibus_bus_list_active_engines_async void ibus_bus_list_active_engines_async
(IBusBus *bus, (IBusBus *bus,
gint timeout_msec, gint timeout_msec,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback GAsyncReadyCallback
callback, callback,
gpointer user_data); gpointer user_data);
/** /**
* ibus_bus_list_active_engines_async_finish: * ibus_bus_list_active_engines_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_list_active_engines_async(). * ibus_bus_list_active_engines_async().
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: (transfer container) (element-type IBusEngineDesc): A List of active engines. * @returns: (transfer container) (element-type IBusEngineDesc): A List of active engines.
* *
* Finishes an operation started with ibus_bus_list_active_engines_async(). * Finishes an operation started with ibus_bus_list_active_engines_async().
*
* Deprecated: 1.5.3: Read dconf value
* /desktop/ibus/general/preload-engines instead.
*/ */
IBUS_DEPRECATED
GList *ibus_bus_list_active_engines_async_finish GList *ibus_bus_list_active_engines_async_finish
(IBusBus *bus, (IBusBus *bus,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
#endif /* IBUS_DISABLE_DEPRECATED */
/** /**
* ibus_bus_get_engines_by_names: * ibus_bus_get_engines_by_names:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @names: (array zero-terminated=1): A %NULL-terminated array of names. * @names: (array zero-terminated=1): A %NULL-terminated array of names.
* @returns: (array zero-terminated=1) (transfer full): A %NULL-terminated array of engines. * @returns: (array zero-terminated=1) (transfer full): A %NULL-terminated array of engines.
* *
* Get engines by given names synchronously. If some engine names do not ex ist, this function * Get engines by given names synchronously. If some engine names do not ex ist, this function
* will simplly ignore them, and return rest of engines. * will simplly ignore them, and return rest of engines.
* TODO(penghuang): add asynchronous version * TODO(penghuang): add asynchronous version
*/ */
IBusEngineDesc ** IBusEngineDesc **
ibus_bus_get_engines_by_names ibus_bus_get_engines_by_names
(IBusBus *bus, (IBusBus *bus,
const gchar * const *names); const gchar * const *names);
#ifndef IBUS_DISABLE_DEPRECATED
/** /**
* ibus_bus_get_use_sys_layout: * ibus_bus_get_use_sys_layout:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: %TRUE if "use_sys_layout" option is enabled. * @returns: %TRUE if "use_sys_layout" option is enabled.
* *
* Check if the bus's "use_sys_layout" option is enabled or not synchronous ly. * Check if the bus's "use_sys_layout" option is enabled or not synchronous ly.
*
* Deprecated: 1.5.3: Read dconf value
* /desktop/ibus/general/use_system_keyboard_layout instead.
*/ */
IBUS_DEPRECATED
gboolean ibus_bus_get_use_sys_layout gboolean ibus_bus_get_use_sys_layout
(IBusBus *bus); (IBusBus *bus);
/** /**
* ibus_bus_get_use_sys_layout_async: * ibus_bus_get_use_sys_layout_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.
* @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
* or %NULL if you don't care about the result of the method invocatio n. * or %NULL if you don't care about the result of the method invocatio n.
* @user_data: The data to pass to callback. * @user_data: The data to pass to callback.
* *
* Check if the bus's "use_sys_layout" option is enabled or not asynchronou sly. * Check if the bus's "use_sys_layout" option is enabled or not asynchronou sly.
*
* Deprecated: 1.5.3: Read dconf value
* /desktop/ibus/general/use_system_keyboard_layout instead.
*/ */
IBUS_DEPRECATED
void ibus_bus_get_use_sys_layout_async void ibus_bus_get_use_sys_layout_async
(IBusBus *bus, (IBusBus *bus,
gint timeout_msec, gint timeout_msec,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback GAsyncReadyCallback
callback, callback,
gpointer user_data); gpointer user_data);
/** /**
* ibus_bus_get_use_sys_layout_async_finish: * ibus_bus_get_use_sys_layout_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_use_sys_layout_async(). * ibus_bus_get_use_sys_layout_async().
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: TRUE if "use_sys_layout" option is enabled. * @returns: TRUE if "use_sys_layout" option is enabled.
* *
* Finishes an operation started with ibus_bus_get_use_sys_layout_async(). * Finishes an operation started with ibus_bus_get_use_sys_layout_async().
*
* Deprecated: 1.5.3: Read dconf value
* /desktop/ibus/general/use_system_keyboard_layout instead.
*/ */
IBUS_DEPRECATED
gboolean ibus_bus_get_use_sys_layout_async_finish gboolean ibus_bus_get_use_sys_layout_async_finish
(IBusBus *bus, (IBusBus *bus,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
/** /**
* ibus_bus_get_use_global_engine: * ibus_bus_get_use_global_engine:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: TRUE if "use_global_engine" option is enabled. * @returns: TRUE if "use_global_engine" option is enabled.
* *
* Check if the bus's "use_global_engine" option is enabled or not synchron ously. * Check if the bus's "use_global_engine" option is enabled or not synchron ously.
*
* Deprecated: 1.5.3: Currently global engine is always used.
*/ */
IBUS_DEPRECATED
gboolean ibus_bus_get_use_global_engine gboolean ibus_bus_get_use_global_engine
(IBusBus *bus); (IBusBus *bus);
/** /**
* ibus_bus_get_use_global_engine_async: * ibus_bus_get_use_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.
* @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
* or %NULL if you don't care about the result of the method invocatio n. * or %NULL if you don't care about the result of the method invocatio n.
* @user_data: The data to pass to callback. * @user_data: The data to pass to callback.
* *
* Check if the bus's "use_global_engine" option is enabled or not asynchro nously. * Check if the bus's "use_global_engine" option is enabled or not asynchro nously.
*
* Deprecated: 1.5.3: Currently global engine is always used.
*/ */
IBUS_DEPRECATED
void ibus_bus_get_use_global_engine_async void ibus_bus_get_use_global_engine_async
(IBusBus *bus, (IBusBus *bus,
gint timeout_msec, gint timeout_msec,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback GAsyncReadyCallback
callback, callback,
gpointer user_data); gpointer user_data);
/** /**
* ibus_bus_get_use_global_engine_async_finish: * ibus_bus_get_use_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_use_global_engine_async(). * ibus_bus_get_use_global_engine_async().
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: %TRUE if "use_global_engine" option is enabled. * @returns: %TRUE if "use_global_engine" option is enabled.
* *
* Finishes an operation started with ibus_bus_get_use_global_engine_async( ). * Finishes an operation started with ibus_bus_get_use_global_engine_async( ).
*
* Deprecated: 1.5.3: Currently global engine is always used.
*/ */
IBUS_DEPRECATED
gboolean ibus_bus_get_use_global_engine_async_finish gboolean ibus_bus_get_use_global_engine_async_finish
(IBusBus *bus, (IBusBus *bus,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
/** /**
* ibus_bus_is_global_engine_enabled: * ibus_bus_is_global_engine_enabled:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: %TRUE if the current global engine is enabled. * @returns: %TRUE if the current global engine is enabled.
* *
* Check if the current global engine is enabled or not synchronously. * Check if the current global engine is enabled or not synchronously.
*
* Deprecated: 1.5.3: Probably this would be used for Chrome OS only.
* Currently global engine is always used and ibus_bus_get_global_engine()
* returns NULL until the first global engine is assigned.
* You can use ibus_set_log_handler() to disable a warning when
* ibus_bus_get_global_engine() returns NULL.
*/ */
IBUS_DEPRECATED
gboolean ibus_bus_is_global_engine_enabled gboolean ibus_bus_is_global_engine_enabled
(IBusBus *bus); (IBusBus *bus);
/** /**
* ibus_bus_is_global_engine_enabled_async: * ibus_bus_is_global_engine_enabled_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.
* @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
* or %NULL if you don't care about the result of the method invocatio n. * or %NULL if you don't care about the result of the method invocatio n.
* @user_data: The data to pass to callback. * @user_data: The data to pass to callback.
* *
* Check if the current global engine is enabled or not asynchronously. * Check if the current global engine is enabled or not asynchronously.
*
* Deprecated: 1.5.3: Probably this would be used for Chrome OS only.
* Currently global engine is always used and ibus_bus_get_global_engine()
* returns NULL until the first global engine is assigned.
* You can use ibus_set_log_handler() to disable a warning when
* ibus_bus_get_global_engine() returns NULL.
*/ */
IBUS_DEPRECATED
void ibus_bus_is_global_engine_enabled_async void ibus_bus_is_global_engine_enabled_async
(IBusBus *bus, (IBusBus *bus,
gint timeout_msec, gint timeout_msec,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback GAsyncReadyCallback
callback, callback,
gpointer user_data); gpointer user_data);
/** /**
* ibus_bus_is_global_engine_enabled_async_finish: * ibus_bus_is_global_engine_enabled_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_is_global_engine_enabled_async(). * ibus_bus_is_global_engine_enabled_async().
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: %TRUE if the current global engine is enabled. * @returns: %TRUE if the current global engine is enabled.
* *
* 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().
*
* Deprecated: 1.5.3: Probably this would be used for Chrome OS only.
* Currently global engine is always used and ibus_bus_get_global_engine()
* returns NULL until the first global engine is assigned.
* You can use ibus_set_log_handler() to disable a warning when
* ibus_bus_get_global_engine() returns NULL.
*/ */
IBUS_DEPRECATED
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);
#endif /* IBUS_DISABLE_DEPRECATED */
/** /**
* ibus_bus_get_global_engine: * ibus_bus_get_global_engine:
* @bus: An #IBusBus. * @bus: An #IBusBus.
* @returns: (transfer none): The description of current global engine, * @returns: (transfer none): The description of current global engine,
* or %NULL if there is no global engine. * or %NULL if there is no global engine.
* *
* Get the description of current global engine synchronously. * Get the description of current global engine synchronously.
*/ */
IBusEngineDesc * IBusEngineDesc *
skipping to change at line 1045 skipping to change at line 1105
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* @returns: %TRUE if component starts. %FALSE otherwise. * @returns: %TRUE if component starts. %FALSE otherwise.
* *
* Finishes an operation started with ibus_bus_preload_engines_async(). * Finishes an operation started with ibus_bus_preload_engines_async().
*/ */
gboolean ibus_bus_preload_engines_async_finish gboolean ibus_bus_preload_engines_async_finish
(IBusBus *bus, (IBusBus *bus,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
/**
* ibus_bus_get_ibus_property:
* @bus: An #IBusBus.
* @property_name: property name in org.freedesktop.DBus.Properties.Get
* @returns: (transfer full): The value in org.freedesktop.DBus.Properties.
Get
* The returned value must be freed with g_variant_unref().
*
* Get org.freedesktop.DBus.Properties.
*/
GVariant * ibus_bus_get_ibus_property (IBusBus *bus,
const gchar *property_name);
/**
* ibus_bus_get_ibus_property_async:
* @bus: An #IBusBus.
* @property_name: property name in org.freedesktop.DBus.Properties.Get
* @timeout_msec: The timeout in milliseconds or -1 to use the default time
out.
* @cancellable: A #GCancellable 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 invocatio
n.
* @user_data: The data to pass to callback.
*
* Get org.freedesktop.DBus.Properties asynchronously.
*/
void ibus_bus_get_ibus_property_async
(IBusBus *bus,
const gchar *property_name,
gint timeout_msec,
GCancellable *cancellable,
GAsyncReadyCallback
callback,
gpointer user_data);
/**
* ibus_bus_get_ibus_property_async_finish:
* @bus: An #IBusBus.
* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
* ibus_bus_get_property_async().
* @error: Return location for error or %NULL.
* @returns: (transfer full): The value in org.freedesktop.DBus.Properties.
Get
* The returned value must be freed with g_variant_unref().
*
* Finishes an operation started with ibus_bus_get_ibus_property_async().
*/
GVariant * ibus_bus_get_ibus_property_async_finish
(IBusBus *bus,
GAsyncResult *res,
GError **error);
/**
* ibus_bus_set_ibus_property:
* @bus: An #IBusBus.
* @property_name: property name in org.freedesktop.DBus.Properties.Set
* @value: value in org.freedesktop.DBus.Properties.Set
*
* Set org.freedesktop.DBus.Properties.
*/
void ibus_bus_set_ibus_property (IBusBus *bus,
const gchar *property_name,
GVariant *value);
/**
* ibus_bus_set_ibus_property_async:
* @bus: An #IBusBus.
* @property_name: property name in org.freedesktop.DBus.Properties.Set
* @value: value in org.freedesktop.DBus.Properties.Set
* @timeout_msec: The timeout in milliseconds or -1 to use the default time
out.
* @cancellable: A #GCancellable 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 invocatio
n.
* @user_data: The data to pass to callback.
*
* Set org.freedesktop.DBus.Properties asynchronously.
*/
void ibus_bus_set_ibus_property_async
(IBusBus *bus,
const gchar *property_name,
GVariant *value,
gint timeout_msec,
GCancellable *cancellable,
GAsyncReadyCallback
callback,
gpointer user_data);
/**
* ibus_bus_set_ibus_property_async_finish:
* @bus: An #IBusBus.
* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
* ibus_bus_set_property_async().
* @error: Return location for error or %NULL.
* @returns: %TRUE if property is set with async. %FALSE failed.
*
* Finishes an operation started with ibus_bus_set_ibus_property_async().
*/
gboolean ibus_bus_set_ibus_property_async_finish
(IBusBus *bus,
GAsyncResult *res,
GError **error);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 32 change blocks. 
2 lines changed or deleted 167 lines changed or added


 ibusshare.h   ibusshare.h 
skipping to change at line 41 skipping to change at line 41
* *
* This file defines some utility functions and definition * This file defines some utility functions and definition
* which are shared among ibus component and services. * which are shared among ibus component and services.
*/ */
#ifndef __IBUS_SHARE_H_ #ifndef __IBUS_SHARE_H_
#define __IBUS_SHARE_H_ #define __IBUS_SHARE_H_
#include <glib.h> #include <glib.h>
#ifdef IBUS_DISABLE_DEPRECATION_WARNINGS
#define IBUS_DEPRECATED
#else
#define IBUS_DEPRECATED G_DEPRECATED
#endif
/** /**
* IBUS_SERVICE_IBUS: * IBUS_SERVICE_IBUS:
* *
* Address of IBus service. * Address of IBus service.
*/ */
#define IBUS_SERVICE_IBUS "org.freedesktop.IBus" #define IBUS_SERVICE_IBUS "org.freedesktop.IBus"
/** /**
* IBUS_SERVICE_PANEL: * IBUS_SERVICE_PANEL:
* *
skipping to change at line 294 skipping to change at line 300
* Parse key event string and return key symbol and modifiers. * Parse key event string and return key symbol and modifiers.
*/ */
gboolean ibus_key_event_from_string gboolean ibus_key_event_from_string
(const gchar *string, (const gchar *string,
guint *keyval, guint *keyval,
guint *modifiers); guint *modifiers);
/** /**
* ibus_init: * ibus_init:
* *
* Init the ibus types. * Initialize the ibus types.
*
* 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().
*/ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 7 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 (5) #define IBUS_MINOR_VERSION (5)
/** /**
* IBUS_MICRO_VERSION: * IBUS_MICRO_VERSION:
* *
* IBus micro version. * IBus micro version.
*/ */
#define IBUS_MICRO_VERSION (2) #define IBUS_MICRO_VERSION (3)
/** /**
* 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/