ibuscomponent.h   ibuscomponent.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibuscomponent * SECTION: ibuscomponent
* @short_description: Component (executable) specification. * @short_description: Component (executable) specification.
* @title: IBusComponent
* @stability: Stable * @stability: Stable
* *
* An IBusComponent is an executable program. * An IBusComponent is an executable program.
* It provides services such as user interface, configuration, * It provides services such as user interface, configuration,
* and input method engine (IME). * and input method engine (IME).
* *
* It is recommended that IME developers provide * It is recommended that IME developers provide
* a component XML file and * a component XML file and
* load the XML file by ibus_component_new_from_file(). * load the XML file by ibus_component_new_from_file().
* *
skipping to change at line 105 skipping to change at line 106
gchar *textdomain; gchar *textdomain;
/*< private >*/ /*< private >*/
/* engines */ /* engines */
GList *engines; GList *engines;
/* observed paths */ /* observed paths */
GList *observed_paths; GList *observed_paths;
GPid pid; GPid pid;
guint child_source_id;
/* padding */
gpointer pdummy[5]; // We can add 5 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);
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added


 ibusconfig.h   ibusconfig.h 
skipping to change at line 23 skipping to change at line 23
* 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.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibusconfig * SECTION: ibusconfig
* @title: IBusConfig
* @short_description: IBus engine configuration module. * @short_description: IBus engine configuration module.
* *
* An IBusConfig provides engine configuration methods * An IBusConfig provides engine configuration methods
* such as get and set the configure settings to configuration file. * such as get and set the configure settings to configuration file.
* *
* Currently, IBusConfig supports gconf. * Currently, IBusConfig supports gconf.
*/ */
#ifndef __CONFIG_H_ #ifndef __CONFIG_H_
#define __CONFIG_H_ #define __CONFIG_H_
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ibusconnection.h   ibusconnection.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibusconnection * SECTION: ibusconnection
* @short_description: DBusConnection wrapper. * @short_description: DBusConnection wrapper.
* @title: IBusConnection
* @stability: Stable * @stability: Stable
* @see_also: IBusMessage
* <ulink url="http://dbus.freedesktop.org/doc/api/html/structDBusConnectio n.html">DBusConnection</ulink> * <ulink url="http://dbus.freedesktop.org/doc/api/html/structDBusConnectio n.html">DBusConnection</ulink>
* *
* An IBusConnection provides #DBusConnection wrapper, and is used to conne ct to either D-Bus or IBus daemon. * An IBusConnection provides #DBusConnection wrapper, and is used to conne ct to either D-Bus or IBus daemon.
* Usually, IBusConnection is set to a #DBusConnection and emitting ibus-me ssage when * Usually, IBusConnection is set to a #DBusConnection and emitting ibus-me ssage when
* receiving incoming messages from the #DBusConnection. * receiving incoming messages from the #DBusConnection.
*
* @see_also: #IBusMessage
*
*/ */
#ifndef __IBUS_CONNECTION_H_ #ifndef __IBUS_CONNECTION_H_
#define __IBUS_CONNECTION_H_ #define __IBUS_CONNECTION_H_
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include "ibusmessage.h" #include "ibusmessage.h"
#include "ibuspendingcall.h" #include "ibuspendingcall.h"
#include "ibusobject.h" #include "ibusobject.h"
#include "ibuserror.h" #include "ibuserror.h"
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 ibusengine.h   ibusengine.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibusengine * SECTION: ibusengine
* @short_description: Input method engine abstract. * @short_description: Input method engine abstract.
* @title: IBusEngine
* @stability: Stable * @stability: Stable
* @see_also: #IBusComponent, #IBusEngineDesc
* *
* An IBusEngine provides infrastructure for input method engine. * An IBusEngine provides infrastructure for input method engine.
* Developers can "extend" this class for input method engine development. * Developers can "extend" this class for input method engine development.
*
* @see_also: #IBusComponent, #IBusEngineDesc
*/ */
#ifndef __IBUS_ENGINE_H_ #ifndef __IBUS_ENGINE_H_
#define __IBUS_ENGINE_H_ #define __IBUS_ENGINE_H_
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include "ibusservice.h" #include "ibusservice.h"
#include "ibusattribute.h" #include "ibusattribute.h"
#include "ibuslookuptable.h" #include "ibuslookuptable.h"
#include "ibusproplist.h" #include "ibusproplist.h"
skipping to change at line 180 skipping to change at line 182
* If caller want to keep the object, caller should make the object * If caller want to keep the object, caller should make the object
* sink by g_object_ref_sink.) * sink by g_object_ref_sink.)
*/ */
void ibus_engine_update_preedit_text void ibus_engine_update_preedit_text
(IBusEngine *engine, (IBusEngine *engine,
IBusText *text, IBusText *text,
guint cursor_pos, guint cursor_pos,
gboolean visible); gboolean visible);
/** /**
* ibus_engine_update_preedit_text_with_mode:
* @engine: An IBusEngine.
* @text: Update content.
* @cursor_pos: Current position of cursor
* @visible: Whether the pre-edit buffer is visible.
* @mode: Pre-edit commit mode when the focus is lost.
*
* Update the pre-edit buffer with commit mode.
* if mode is IBUS_ENGINE_PREEDIT_CLEAR,
* ibus_engine_update_preedit_text_with_mode is compatible with
* ibus_engine_update_preedit_text.
*
* (Note: The text object will be released, if it is floating.
* If caller want to keep the object, caller should make the object
* sink by g_object_ref_sink.)
*/
void ibus_engine_update_preedit_text_with_mode
(IBusEngine *engine,
IBusText *text,
guint cursor_po
s,
gboolean visible,
IBusPreeditFocusMode mode);
/**
* ibus_engine_show_preedit_text: * ibus_engine_show_preedit_text:
* @engine: An IBusEngine. * @engine: An IBusEngine.
* *
* Show the pre-edit buffer. * Show the pre-edit buffer.
*/ */
void ibus_engine_show_preedit_text void ibus_engine_show_preedit_text
(IBusEngine *engine); (IBusEngine *engine);
/** /**
* ibus_engine_hide_preedit_text: * ibus_engine_hide_preedit_text:
 End of changes. 4 change blocks. 
1 lines changed or deleted 28 lines changed or added


 ibusenginedesc.h   ibusenginedesc.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibusenginedesc * SECTION: ibusenginedesc
* @short_description: Input method engine description data. * @short_description: Input method engine description data.
* @title: IBusEngineDesc
* @stability: Stable * @stability: Stable
* @see_also: #IBusComponent, #IBusEngine
* *
* An IBusEngineDesc stores description data of IBusEngine. * An IBusEngineDesc stores description data of IBusEngine.
* The description data can either be passed to ibus_engine_desc_new(), * The description data can either be passed to ibus_engine_desc_new(),
* or loaded from an XML node through ibus_engine_desc_new_from_xml_node() * or loaded from an XML node through ibus_engine_desc_new_from_xml_node()
* to construct IBusEngineDesc. * to construct IBusEngineDesc.
* *
* However, the recommended way to load engine description data is * However, the recommended way to load engine description data is
* using ibus_component_new_from_file() to load a component file, * using ibus_component_new_from_file() to load a component file,
* which also includes engine description data. * which also includes engine description data.
*
* @see_also: #IBusComponent, #IBusEngine
*
*/ */
#ifndef __ENGINE_DESC_H_ #ifndef __ENGINE_DESC_H_
#define __ENGINE_DESC_H_ #define __ENGINE_DESC_H_
#include "ibusserializable.h" #include "ibusserializable.h"
#include "ibusxml.h" #include "ibusxml.h"
/* /*
* Type macros. * Type macros.
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 ibusenumtypes.h   ibusenumtypes.h 
skipping to change at line 131 skipping to change at line 131
GType ibus_capabilite_get_type (void) G_GNUC_CONST; GType ibus_capabilite_get_type (void) G_GNUC_CONST;
/** /**
* IBUS_TYPE_CAPABILITE: * IBUS_TYPE_CAPABILITE:
* @returns: GType of IBUS_CAPABILITE * @returns: GType of IBUS_CAPABILITE
* *
* Returns the type of IBUS_CAPABILITE as GType. * Returns the type of IBUS_CAPABILITE as GType.
*/ */
#define IBUS_TYPE_CAPABILITE (ibus_capabilite_get_type ()) #define IBUS_TYPE_CAPABILITE (ibus_capabilite_get_type ())
/** /**
* ibus_preedit_focus_mode_get_type:
* @returns: GType of IBUS_PREEDIT_FOCUS_MODE
*
* Returns the type of IBUS_PREEDIT_FOCUS_MODE as GType.
*/
GType ibus_preedit_focus_mode_get_type (void) G_GNUC_CONST;
/**
* IBUS_TYPE_PREEDIT_FOCUS_MODE:
* @returns: GType of IBUS_PREEDIT_FOCUS_MODE
*
* Returns the type of IBUS_PREEDIT_FOCUS_MODE as GType.
*/
#define IBUS_TYPE_PREEDIT_FOCUS_MODE (ibus_preedit_focus_mode_get_type ())
/**
* ibus_orientation_get_type: * ibus_orientation_get_type:
* @returns: GType of IBUS_ORIENTATION * @returns: GType of IBUS_ORIENTATION
* *
* Returns the type of IBUS_ORIENTATION as GType. * Returns the type of IBUS_ORIENTATION as GType.
*/ */
GType ibus_orientation_get_type (void) G_GNUC_CONST; GType ibus_orientation_get_type (void) G_GNUC_CONST;
/** /**
* IBUS_TYPE_ORIENTATION: * IBUS_TYPE_ORIENTATION:
* @returns: GType of IBUS_ORIENTATION * @returns: GType of IBUS_ORIENTATION
 End of changes. 1 change blocks. 
0 lines changed or deleted 15 lines changed or added


 ibusfactory.h   ibusfactory.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibusfactory * SECTION: ibusfactory
* @short_description: Factory for creating engine instances. * @short_description: Factory for creating engine instances.
* @title: IBusFactory
* @stability: Stable * @stability: Stable
* @see_also: #IBusEngine
* *
* An IBusFactory is an #IBusService that creates input method engine (IME) instance. * An IBusFactory is an #IBusService that creates input method engine (IME) instance.
* It provides CreateEngine remote method, which creates an IME instance by name, * It provides CreateEngine remote method, which creates an IME instance by name,
* and returns the D-Bus object path to IBus daemon. * and returns the D-Bus object path to IBus daemon.
*
* @see_also: #IBusEngine
*
*/ */
#ifndef __IBUS_FACTORY_H_ #ifndef __IBUS_FACTORY_H_
#define __IBUS_FACTORY_H_ #define __IBUS_FACTORY_H_
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include "ibusservice.h" #include "ibusservice.h"
#include "ibusserializable.h" #include "ibusserializable.h"
G_BEGIN_DECLS G_BEGIN_DECLS
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 ibuskeymap.h   ibuskeymap.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibuskeymap * SECTION: ibuskeymap
* @short_description: Keyboard mapping handling. * @short_description: Keyboard mapping handling.
* @title: IBusKeymap
* @stability: Stable * @stability: Stable
* @see_also: #IBusComponent, #IBusEngineDesc
* *
* An IBusKeymap defines the mapping between keyboard scancodes and * An IBusKeymap defines the mapping between keyboard scancodes and
* keyboard symbols such as numbers, alphabets, and punctuation marks. * keyboard symbols such as numbers, alphabets, and punctuation marks.
* *
* Some input methods assume certain keyboard layout * Some input methods assume certain keyboard layout
* (such as Chewing and Wubi requires an US-QWERTY layout), * (such as Chewing and Wubi requires an US-QWERTY layout),
* and expect key symbols to be arranged in that order. * and expect key symbols to be arranged in that order.
* These input methods should new an IBusKeymap * These input methods should new an IBusKeymap
* instance and define the keyboard layout. * instance and define the keyboard layout.
* Then ibus_keymap_lookup_keysym() can * Then ibus_keymap_lookup_keysym() can
* convert scancodes back to the key symbols. * convert scancodes back to the key symbols.
* *
* @see_also: #IBusComponent, #IBusEngineDesc
*
*/ */
#ifndef __IBUS_KEYMAP_H_ #ifndef __IBUS_KEYMAP_H_
#define __IBUS_KEYMAP_H_ #define __IBUS_KEYMAP_H_
#include "ibusobject.h" #include "ibusobject.h"
/* /*
* Type macros. * Type macros.
*/ */
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 lines changed or added


 ibuskeysyms.h   ibuskeysyms.h 
skipping to change at line 23 skipping to change at line 23
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibuskeysyms * SECTION: ibuskeysyms
* @short_description: Key symbol definition. * @short_description: Key symbol definition.
* @title: IBusKeysyms
* @stability: Stable * @stability: Stable
* @see_also: #IBusKeymap, #IBusHotkeyProfile
* *
* This section defines the key symbols (keysym) used in IBus. * This section defines the key symbols (keysym) used in IBus.
* Those keysym data is converted from keysymdef.h in * Those keysym data is converted from keysymdef.h in
* FreeDesktop. * FreeDesktop.
* *
* Most of the key symbols are not explicit documented, * Most of the key symbols are not explicit documented,
* because they are self-explaining. * because they are self-explaining.
*
* @see_also: #IBusKeymap, #IBusHotkeyProfile
*
*/ */
#ifndef __IBUS_KEYSYMS_H__ #ifndef __IBUS_KEYSYMS_H__
#define __IBUS_KEYSYMS_H__ #define __IBUS_KEYSYMS_H__
#define IBUS_VoidSymbol 0xffffff #define IBUS_VoidSymbol 0xffffff
#define IBUS_BackSpace 0xff08 #define IBUS_BackSpace 0xff08
#define IBUS_Tab 0xff09 #define IBUS_Tab 0xff09
#define IBUS_Linefeed 0xff0a #define IBUS_Linefeed 0xff0a
#define IBUS_Clear 0xff0b #define IBUS_Clear 0xff0b
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 ibusobject.h   ibusobject.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibusobject * SECTION: ibusobject
* @short_description: Base object of IBus. * @short_description: Base object of IBus.
* @title: IBusObject
* @stability: Stable * @stability: Stable
* *
* IBusObject is the base object for all objects in IBus. * IBusObject is the base object for all objects in IBus.
*/ */
#ifndef __IBUS_OBJECT_H_ #ifndef __IBUS_OBJECT_H_
#define __IBUS_OBJECT_H_ #define __IBUS_OBJECT_H_
#include <glib-object.h> #include <glib-object.h>
#include "ibusmarshalers.h" #include "ibusmarshalers.h"
#include "ibustypes.h" #include "ibustypes.h"
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ibuspendingcall.h   ibuspendingcall.h 
skipping to change at line 23 skipping to change at line 23
* 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.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibuspendingcall * SECTION: ibuspendingcall
* @Title: IBusPendingCall * @title: IBusPendingCall
* @Short_description: A DBusPendingCall in IBus. * @short_description: A DBusPendingCall in IBus.
* @Stability: Stable * @stability: Stable
* *
* An IBusPendingCall is essentially a DBusPendingCall, which representing an expected reply. * An IBusPendingCall is essentially a DBusPendingCall, which representing an expected reply.
* A IBusPendingCall can be created when you send a message that should hav e a reply. * A IBusPendingCall can be created when you send a message that should hav e a reply.
* *
* Besides DBusPendingCall functions, An IBusPendingCall can be manipulated * Besides DBusPendingCall functions, An IBusPendingCall can be manipulated
* with its own specific functions, which are defined in this section. * with its own specific functions, which are defined in this section.
*/ */
#ifndef __IBUS_PENDING_CALL_H_ #ifndef __IBUS_PENDING_CALL_H_
#define __IBUS_PENDING_CALL_H_ #define __IBUS_PENDING_CALL_H_
 End of changes. 1 change blocks. 
3 lines changed or deleted 3 lines changed or added


 ibusproperty.h   ibusproperty.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibusproperty * SECTION: ibusproperty
* @short_description: UI component for input method engine property. * @short_description: UI component for input method engine property.
* @title: IBusProperty
* @stability: Stable * @stability: Stable
* @see_also: #IBusEngine
* *
* An IBusProperty is an UI component like a button or a menu item * An IBusProperty is an UI component like a button or a menu item
* which shows the status of corresponding input method engine property. * which shows the status of corresponding input method engine property.
* End user can operate and see the current status of IME through these com ponents. * End user can operate and see the current status of IME through these com ponents.
* For example, ibus-chewing users change the English/Chinese input mode by * For example, ibus-chewing users change the English/Chinese input mode by
* pressing ctrl-space or click on the Eng/Chi switch button. * pressing ctrl-space or click on the Eng/Chi switch button.
* And the IBusProperty shows the change correspondingly. * And the IBusProperty shows the change correspondingly.
*
* @see_also: #IBusPropList, #IBusEngine
*/ */
#ifndef __IBUS_PROPERTY_H_ #ifndef __IBUS_PROPERTY_H_
#define __IBUS_PROPERTY_H_ #define __IBUS_PROPERTY_H_
#include "ibusserializable.h" #include "ibusserializable.h"
#include "ibustext.h" #include "ibustext.h"
G_BEGIN_DECLS G_BEGIN_DECLS
/* /*
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 lines changed or added


 ibusproplist.h   ibusproplist.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/** /**
* SECTION: ibusproplist * SECTION: ibusproplist
* @Title: IBusPropList * @Title: IBusPropList
* @Short_description: UI component for input method engine property. * @Short_description: An #IBusProperty container.
* @Stability: Stable * @Stability: Stable
* @See_also: #IBusEngine *
* @See_also: #IBusProperty, #IBusEngine
* *
*/ */
#ifndef __IBUS_PROP_LIST_H_ #ifndef __IBUS_PROP_LIST_H_
#define __IBUS_PROP_LIST_H_ #define __IBUS_PROP_LIST_H_
#include "ibusserializable.h" #include "ibusserializable.h"
#include "ibusproperty.h" #include "ibusproperty.h"
G_BEGIN_DECLS G_BEGIN_DECLS
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 ibusproxy.h   ibusproxy.h 
skipping to change at line 169 skipping to change at line 169
* @proxy: An IBusProxy. * @proxy: An IBusProxy.
* @method: The method to be called. * @method: The method to be called.
* @timeout_milliseconds: Time out in milliseconds. * @timeout_milliseconds: Time out in milliseconds.
* @error: Returned error is stored here; NULL to ignore error. * @error: Returned error is stored here; NULL to ignore error.
* @first_arg_type: Type of first argument. * @first_arg_type: Type of first argument.
* @...: Rest of arguments, NULL to mark the end. * @...: Rest of arguments, NULL to mark the end.
* @returns: An IBusMessage that is the reply or NULL with an error code if the function fails. * @returns: An IBusMessage that is the reply or NULL with an error code if the function fails.
* *
* Call a method of the corresponding service and blocks a certain time per iod while waiting for * Call a method of the corresponding service and blocks a certain time per iod while waiting for
* an IBusMessage as reply. * an IBusMessage as reply.
* If the IBusMessagwe is not NULL, it calls ibus_connection_send_with_rep * If the IBusMessage is not NULL, it calls ibus_connection_send_with_reply
ly_and_block() to do the actual sending. _and_block() to do the
* actual sending.
* *
* @see_also: ibus_connection_send_with_reply_and_block(), * @see_also: ibus_connection_send_with_reply_and_block(),
* @see_also: ibus_proxy_call(), ibus_proxy_send_with_reply(), ibus_proxy_c all_with_reply_and_block(). * @see_also: ibus_proxy_call(), ibus_proxy_send_with_reply(), ibus_proxy_c all_with_reply_and_block().
*/ */
IBusMessage *ibus_proxy_call_with_reply_and_block IBusMessage *ibus_proxy_call_with_reply_and_block
(IBusProxy *proxy, (IBusProxy *proxy,
const gchar *method, const gchar *method,
gint timeout_mi lliseconds, gint timeout_mi lliseconds,
IBusError **error, IBusError **error,
GType first_arg_ type, GType first_arg_ type,
skipping to change at line 210 skipping to change at line 211
gint timeout_mi lliseconds); gint timeout_mi lliseconds);
/** /**
* ibus_proxy_send_with_reply_and_block: * ibus_proxy_send_with_reply_and_block:
* @proxy: An IBusProxy. * @proxy: An IBusProxy.
* @message: The IBusMessage to be sent. * @message: The IBusMessage to be sent.
* @returns: An IBusMessage that is the reply or NULL with an error code if the function fails. * @returns: An IBusMessage that is the reply or NULL with an error code if the function fails.
* *
* Send an IBusMessage to the corresponding service and blocks a certain ti me period while waiting for * Send an IBusMessage to the corresponding service and blocks a certain ti me period while waiting for
* an IBusMessage as reply. * an IBusMessage as reply.
* If the IBusMessage is not NULL, it calls ibus_connection_send_with_repl * If the IBusMessage is not NULL, it calls ibus_connection_send_with_reply
y_and_block() to do the actual sending. _and_block() to do the
* actual sending.
* *
* @see_also: ibus_connection_send_with_reply_and_block(), * @see_also: ibus_connection_send_with_reply_and_block(),
* @see_also: ibus_proxy_send(), ibus_proxy_send_with_reply(), ibus_proxy_c all_with_reply_and_block(). * @see_also: ibus_proxy_send(), ibus_proxy_send_with_reply(), ibus_proxy_c all_with_reply_and_block().
*/ */
IBusMessage *ibus_proxy_send_with_reply_and_block IBusMessage *ibus_proxy_send_with_reply_and_block
(IBusProxy *proxy, (IBusProxy *proxy,
IBusMessage *message); IBusMessage *message);
/** /**
* ibus_proxy_handle_signal: * ibus_proxy_handle_signal:
 End of changes. 2 change blocks. 
4 lines changed or deleted 6 lines changed or added


 ibustypes.h   ibustypes.h 
skipping to change at line 115 skipping to change at line 115
typedef enum { typedef enum {
IBUS_CAP_PREEDIT_TEXT = 1 << 0, IBUS_CAP_PREEDIT_TEXT = 1 << 0,
IBUS_CAP_AUXILIARY_TEXT = 1 << 1, IBUS_CAP_AUXILIARY_TEXT = 1 << 1,
IBUS_CAP_LOOKUP_TABLE = 1 << 2, IBUS_CAP_LOOKUP_TABLE = 1 << 2,
IBUS_CAP_FOCUS = 1 << 3, IBUS_CAP_FOCUS = 1 << 3,
IBUS_CAP_PROPERTY = 1 << 4, IBUS_CAP_PROPERTY = 1 << 4,
IBUS_CAP_SURROUNDING_TEXT = 1 << 5, IBUS_CAP_SURROUNDING_TEXT = 1 << 5,
} IBusCapabilite; } IBusCapabilite;
/** /**
* IBusPreeditFocusMode:
* @IBUS_ENGINE_PREEDIT_CLEAR: pre-edit text is cleared.
* @IBUS_ENGINE_PREEDIT_COMMIT: pre-edit text is committed.
*
* Pre-edit commit mode when the focus is lost.
*/
typedef enum {
IBUS_ENGINE_PREEDIT_CLEAR = 0,
IBUS_ENGINE_PREEDIT_COMMIT = 1,
} IBusPreeditFocusMode;
/**
* IBusOrientation: * IBusOrientation:
* @IBUS_ORIENTATION_HORIZONTAL: Horizontal orientation. * @IBUS_ORIENTATION_HORIZONTAL: Horizontal orientation.
* @IBUS_ORIENTATION_VERTICAL: Vertival orientation. * @IBUS_ORIENTATION_VERTICAL: Vertival orientation.
* @IBUS_ORIENTATION_SYSTEM: Use ibus global orientation setup. * @IBUS_ORIENTATION_SYSTEM: Use ibus global orientation setup.
* *
* Orientation of UI. * Orientation of UI.
*/ */
typedef enum { typedef enum {
IBUS_ORIENTATION_HORIZONTAL = 0, IBUS_ORIENTATION_HORIZONTAL = 0,
IBUS_ORIENTATION_VERTICAL = 1, IBUS_ORIENTATION_VERTICAL = 1,
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added


 ibusversion.h   ibusversion.h 
skipping to change at line 45 skipping to change at line 45
* *
* IBus major version. * IBus major version.
*/ */
#define IBUS_MAJOR_VERSION (1) #define IBUS_MAJOR_VERSION (1)
/** /**
* IBUS_MINOR_VERSION: * IBUS_MINOR_VERSION:
* *
* IBus minor version. * IBus minor version.
*/ */
#define IBUS_MINOR_VERSION (2) #define IBUS_MINOR_VERSION (3)
/** /**
* IBUS_MICRO_VERSION: * IBUS_MICRO_VERSION:
* *
* IBus micro version. * IBus micro version.
*/ */
#define IBUS_MICRO_VERSION (99) #define IBUS_MICRO_VERSION (0)
/** /**
* 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. 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/