ibus.h   ibus.h 
skipping to change at line 50 skipping to change at line 50
#include <ibuspendingcall.h> #include <ibuspendingcall.h>
#include <ibuserror.h> #include <ibuserror.h>
#include <ibusenumtypes.h> #include <ibusenumtypes.h>
#include <ibushotkey.h> #include <ibushotkey.h>
#include <ibusxml.h> #include <ibusxml.h>
#include <ibusenginedesc.h> #include <ibusenginedesc.h>
#include <ibusobservedpath.h> #include <ibusobservedpath.h>
#include <ibuscomponent.h> #include <ibuscomponent.h>
#include <ibusconfig.h> #include <ibusconfig.h>
#include <ibusconfigservice.h> #include <ibusconfigservice.h>
#include <ibusmainloop.h>
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ibusattribute.h   ibusattribute.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: ibusattribute * SECTION: ibusattribute
* @short_description: Attributes of IBusText. * @short_description: Attributes of IBusText.
* @stability: Stable
* @see_also: #IBusText * @see_also: #IBusText
* @stability: Stable
* *
* An IBusAttribute represents an attribute that associate to IBusText. * An IBusAttribute represents an attribute that associate to IBusText.
* It decorates preedit buffer and auxiliary text with underline, foregroun d and background colors. * It decorates preedit buffer and auxiliary text with underline, foregroun d and background colors.
*/ */
#ifndef __IBUS_ATTRIBUTE_H_ #ifndef __IBUS_ATTRIBUTE_H_
#define __IBUS_ATTRIBUTE_H_ #define __IBUS_ATTRIBUTE_H_
#include "ibusserializable.h" #include "ibusserializable.h"
/* /*
* Type macros. * Type macros.
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ibusconfigservice.h   ibusconfigservice.h 
skipping to change at line 133 skipping to change at line 133
typedef struct _IBusConfigService IBusConfigService; typedef struct _IBusConfigService IBusConfigService;
typedef struct _IBusConfigServiceClass IBusConfigServiceClass; typedef struct _IBusConfigServiceClass IBusConfigServiceClass;
/** /**
* IBusConfigService: * IBusConfigService:
* *
* An opaque data type representing a configure service. * An opaque data type representing a configure service.
*/ */
struct _IBusConfigService { struct _IBusConfigService {
/*< private >*/
IBusService parent; IBusService parent;
/* instance members */ /* instance members */
}; };
struct _IBusConfigServiceClass { struct _IBusConfigServiceClass {
IBusServiceClass parent; IBusServiceClass parent;
/* class members */ /* class members */
gboolean (* set_value) (IBusConfigService *config, gboolean (* set_value) (IBusConfigService *config,
const gchar *section, const gchar *section,
const gchar *name, const gchar *name,
 End of changes. 2 change blocks. 
2 lines changed or deleted 0 lines changed or added


 ibusconnection.h   ibusconnection.h 
skipping to change at line 297 skipping to change at line 297
*/ */
gboolean ibus_connection_send (IBusConnection *co nnection, gboolean ibus_connection_send (IBusConnection *co nnection,
IBusMessage *me ssage); IBusMessage *me ssage);
/** /**
* ibus_connection_send_signal: * ibus_connection_send_signal:
* @connection: An IBusConnection. * @connection: An IBusConnection.
* @path: The path to the object emitting the signal. * @path: The path to the object emitting the signal.
* @interface: The interface the signal is emitted from. * @interface: The interface the signal is emitted from.
* @name: Name of the signal. * @name: Name of the signal.
* @first_arg_type: Type of first arg. * @first_arg_type: Type of first argument.
* @...: Rest of arguments, NULL to mark the end.
* @returns: TRUE if succeed; FALSE otherwise. * @returns: TRUE if succeed; FALSE otherwise.
* *
* Send a wrapped D-Bus signal to an IBusConnection. * Send a wrapped D-Bus signal to an IBusConnection.
* This function wraps a signal as an IBusMessage, then sent the IBusMessag e * This function wraps a signal as an IBusMessage, then sent the IBusMessag e
* via ibus_connection_send(). * via ibus_connection_send().
* *
* @see_also: ibus_connection_send(), ibus_connection_send_signal_valist(), ibus_message_new_signal(). * @see_also: ibus_connection_send(), ibus_connection_send_signal_valist(), ibus_message_new_signal().
*/ */
gboolean ibus_connection_send_signal (IBusConnection *co nnection, gboolean ibus_connection_send_signal (IBusConnection *co nnection,
const gchar *pa th, const gchar *pa th,
skipping to change at line 378 skipping to change at line 379
const gchar *pa th, const gchar *pa th,
const gchar *in terface, const gchar *in terface,
const gchar *na me, const gchar *na me,
GType fi rst_arg_type, GType fi rst_arg_type,
va_list ar gs); va_list ar gs);
/** /**
* ibus_connection_send_with_reply: * ibus_connection_send_with_reply:
* @connection: An IBusConnection. * @connection: An IBusConnection.
* @message: An IBusMessage. * @message: An IBusMessage.
* @pending_return: Return location for a DBusPendingCall object, or NULL i f connection is disconnected. * @pending_return: Return location of a IBusPendingCall object, or NULL if connection is disconnected.
* @timeout_milliseconds: timeout in milliseconds or -1 for default. * @timeout_milliseconds: timeout in milliseconds or -1 for default.
* @returns: FALSE if no memory, TRUE otherwise. * @returns: FALSE if no memory, TRUE otherwise.
* *
* Queues an IBusMessage to send, but also returns a DBusPendingCall used to receive a reply to the message. * Queues an IBusMessage to send, and returns a IBusPendingCall used to re ceive a reply to the message.
* This function is a wrapper of dbus_connection_send_with_reply(). * This function is a wrapper of dbus_connection_send_with_reply().
* *
* @see_also: ibus_connection_send(), ibus_connection_send_with_reply_and_b lock(), * @see_also: ibus_connection_send(), ibus_connection_send_with_reply_and_b lock(),
* #DBusPendingCall, dbus_connection_send_with_reply() * ibus_proxy_call_with_reply(),
* #IBusPendingCall, dbus_connection_send_with_reply()
*/ */
gboolean ibus_connection_send_with_reply (IBusConnection *co nnection, gboolean ibus_connection_send_with_reply (IBusConnection *co nnection,
IBusMessage *me ssage, IBusMessage *me ssage,
IBusPendingCall **pe nding_return, IBusPendingCall **pe nding_return,
gint ti meout_milliseconds); gint ti meout_milliseconds);
/** /**
* ibus_connection_send_with_reply_and_block: * ibus_connection_send_with_reply_and_block:
* @connection: An IBusConnection. * @connection: An IBusConnection.
* @message: An IBusMessage. * @message: An IBusMessage.
* @timeout_milliseconds: timeout in milliseconds or -1 for default. * @timeout_milliseconds: timeout in milliseconds or -1 for default.
* @error: Error is stored here; NULL to ignore error. * @error: Returned error is stored here; NULL to ignore error.
* @returns: The message that is the reply or NULL with an error code if th * @returns: An IBusMessage that is the reply or NULL with an error code if
e function fails. the function fails.
* *
* Sends an IBus message and blocks a certain time period while waiting for * Sends an IBus message and blocks a certain time period while waiting for
a reply. * an IBusMessage as reply.
* If reply is not NULL, signal <constant>ibus-message-sent</constant> is * If the IBusMessage is not NULL, signal <constant>ibus-message-sent</con
emitted. stant> is emitted.
* *
* @see_also: ibus_connection_send(), ibus_connection_send_with_reply(), * @see_also: ibus_connection_send(), ibus_connection_send_with_reply(),
* #DBusPendingCall, dbus_connection_send_with_reply_and_block() * dbus_connection_send_with_reply_and_block()
*/ */
IBusMessage *ibus_connection_send_with_reply_and_block IBusMessage *ibus_connection_send_with_reply_and_block
(IBusConnection *co nnection, (IBusConnection *co nnection,
IBusMessage *me ssage, IBusMessage *me ssage,
gint ti meout_milliseconds, gint ti meout_milliseconds,
IBusError **e rror); IBusError **e rror);
/** /**
* ibus_connection_call: * ibus_connection_call:
* @connection: An IBusConnection. * @connection: An IBusConnection.
* @name: Name of the signal. * @name: Name of the signal.
* @path: The path to the object emitting the signal. * @path: The path to the object emitting the signal.
* @interface: The interface the signal is emitted from. * @interface: The interface the signal is emitted from.
* @member: The name of the member function to be called. * @member: The name of the member function to be called.
* @error: Error is stored here; NULL to ignore error. * @error: Returned error is stored here; NULL to ignore error.
* @first_arg_type: Type of first arg. * @first_arg_type: Type of first argument.
* @...: Rest of arguments, NULL to mark the end.
* @returns: TRUE if succeed; FALSE otherwise. * @returns: TRUE if succeed; FALSE otherwise.
* *
* Invoke a member function by sending an IBusMessage. * Invoke a member function by sending an IBusMessage.
* *
* @see_also: ibus_connection_send_valist(). * @see_also: ibus_connection_send_valist().
*/ */
gboolean ibus_connection_call (IBusConnection *co nnection, gboolean ibus_connection_call (IBusConnection *co nnection,
const gchar *na me, const gchar *na me,
const gchar *pa th, const gchar *pa th,
const gchar *in terface, const gchar *in terface,
 End of changes. 8 change blocks. 
14 lines changed or deleted 17 lines changed or added


 ibuserror.h   ibuserror.h 
skipping to change at line 69 skipping to change at line 69
* *
* New an IBusError from error name and message. * New an IBusError from error name and message.
*/ */
IBusError *ibus_error_new_from_text (const gchar *name, IBusError *ibus_error_new_from_text (const gchar *name,
const gchar *message); const gchar *message);
/** /**
* ibus_error_new_from_printf: * ibus_error_new_from_printf:
* @name: The error name. * @name: The error name.
* @format_message: printf() formatted error message. * @format_message: printf() formatted error message.
* @...: Formatting parameters.
* @returns: A newly allocated IBusError. * @returns: A newly allocated IBusError.
* *
* New an IBusError from error name and a printf-formatted message. * New an IBusError from error name and a printf-formatted message.
*/ */
IBusError *ibus_error_new_from_printf (const gchar *name, IBusError *ibus_error_new_from_printf (const gchar *name,
const gchar *format_message , const gchar *format_message ,
...); ...);
/** /**
* ibus_error_new_from_message: * ibus_error_new_from_message:
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ibusfactory.h   ibusfactory.h 
skipping to change at line 144 skipping to change at line 144
* ibus_factory_new: * ibus_factory_new:
* @connection: An IBusConnection. * @connection: An IBusConnection.
* @returns: A newly allocated IBusFactory. * @returns: A newly allocated IBusFactory.
* *
* New an IBusFactory. * New an IBusFactory.
*/ */
IBusFactory *ibus_factory_new (IBusConnection *connection ); IBusFactory *ibus_factory_new (IBusConnection *connection );
/** /**
* ibus_factory_add_engine: * ibus_factory_add_engine:
* @connection: An IBusConnection. * @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_get_info: * ibus_factory_get_info:
* @factory: An IBusFactory * @factory: An IBusFactory.
* @returns: A corresponding IbusFactoryInfo. * @returns: A corresponding IbusFactoryInfo.
* *
* Get IBusFactoryInfo out of IBusFactory. * Get IBusFactoryInfo out of IBusFactory.
* *
* <note><para>This function is currently commented out</para></note> * <note><para>This function is currently commented out</para></note>
*/ */
IBusFactoryInfo *ibus_factory_get_info (IBusFactory *factory); IBusFactoryInfo *ibus_factory_get_info (IBusFactory *factory);
GType ibus_factory_info_get_type (void); GType ibus_factory_info_get_type (void);
/** /**
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ibushotkey.h   ibushotkey.h 
skipping to change at line 20 skipping to change at line 20
* 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.
* *
* 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: ibushotkey
* @short_description: Hotkeys and associated events.
* @stability: Stable
*
* An IBusHotkeyProfile associates a hotkey and an event.
*/
#ifndef __IBUS_HOTKEY_H_ #ifndef __IBUS_HOTKEY_H_
#define __IBUS_HOTKEY_H_ #define __IBUS_HOTKEY_H_
#include "ibusserializable.h" #include "ibusserializable.h"
/* /*
* Type macros. * Type macros.
*/ */
/* define IBusHotkeyProfile macros */ /* define IBusHotkeyProfile macros */
#define IBUS_TYPE_HOTKEY_PROFILE \ #define IBUS_TYPE_HOTKEY_PROFILE \
skipping to change at line 47 skipping to change at line 54
#define IBUS_IS_HOTKEY_PROFILE_CLASS(klass) \ #define IBUS_IS_HOTKEY_PROFILE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_HOTKEY_PROFILE)) (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_HOTKEY_PROFILE))
#define IBUS_HOTKEY_PROFILE_GET_CLASS(obj) \ #define IBUS_HOTKEY_PROFILE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_HOTKEY_PROFILE, IBusHotkey ProfileClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_HOTKEY_PROFILE, IBusHotkey ProfileClass))
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _IBusHotkeyProfile IBusHotkeyProfile; typedef struct _IBusHotkeyProfile IBusHotkeyProfile;
typedef struct _IBusHotkeyProfileClass IBusHotkeyProfileClass; typedef struct _IBusHotkeyProfileClass IBusHotkeyProfileClass;
/**
* IBusHotkeyProfile:
*
* An opaque data type representing an IBusHotkeyProfile.
*/
struct _IBusHotkeyProfile { struct _IBusHotkeyProfile {
IBusSerializable parent; IBusSerializable parent;
/* members */ /* members */
}; };
struct _IBusHotkeyProfileClass { struct _IBusHotkeyProfileClass {
IBusSerializableClass parent; IBusSerializableClass parent;
void (* trigger) (IBusHotkeyProfile *profile, void (* trigger) (IBusHotkeyProfile *profile,
GQuark event, GQuark event,
gpointer user_data); gpointer user_data);
}; };
/* hotkey profile functions */ /* hotkey profile functions */
GType ibus_hotkey_profile_get_type (void); GType ibus_hotkey_profile_get_type (void);
/**
* ibus_hotkey_profile_new:
* @returns: A newly allocated IBusHotkeyProfile.
*
* New an IBusHotkeyProfile.
*/
IBusHotkeyProfile IBusHotkeyProfile
*ibus_hotkey_profile_new (void); *ibus_hotkey_profile_new (void);
/**
* ibus_hotkey_profile_add_hotkey :
* @profile: An IBusHotkeyProfile.
* @keyval: Keycode of the hotkey.
* @modifiers: Modifiers of the hotkey.
* @event: The event to be associated.
* @returns: Always TRUE.
*
* Add a hotkey and its associated event to an IBusHotkeyProfile.
*/
gboolean ibus_hotkey_profile_add_hotkey (IBusHotkeyProfile *profil e, gboolean ibus_hotkey_profile_add_hotkey (IBusHotkeyProfile *profil e,
guint keyval , guint keyval ,
guint modifi ers, guint modifi ers,
GQuark event) ; GQuark event) ;
/**
* ibus_hotkey_profile_add_hotkey_from_string:
* @profile: An IBusHotkeyProfile.
* @str: Key in string representation. '+' is the separator.
* @event: The event to be associated.
* @returns: FALSE if @str contains invalid symbol; TRUE otherwise.
*
* Add a hotkey and its associated event to an IBusHotkeyProfile.
* The hotkey is in string format, such like <constant>Control+Shift+A</con
stant>.
*/
gboolean ibus_hotkey_profile_add_hotkey_from_string gboolean ibus_hotkey_profile_add_hotkey_from_string
(IBusHotkeyProfile *profil e, (IBusHotkeyProfile *profil e,
const gchar *str, const gchar *str,
GQuark event) ; GQuark event) ;
/**
* ibus_hotkey_profile_remove_hotkey:
* @profile: An IBusHotkeyProfile.
* @keyval: Keycode of the hotkey.
* @modifiers: Modifiers of the hotkey.
* @returns: FALSE if the key is not in @profile, TRUE otherwise.
*
* Remove the hotkey for an IBusHotkeyProfile.
*/
gboolean ibus_hotkey_profile_remove_hotkey gboolean ibus_hotkey_profile_remove_hotkey
(IBusHotkeyProfile *profil e, (IBusHotkeyProfile *profil e,
guint keyval , guint keyval ,
guint modifi ers); guint modifi ers);
/**
* ibus_hotkey_profile_remove_hotkey_by_event:
* @profile: An IBusHotkeyProfile.
* @event: The associated event.
* @returns: FALSE if no such event in @profile, TRUE otherwise.
*
* Remove the hotkey for an IBusHotkeyProfile by event.
*/
gboolean ibus_hotkey_profile_remove_hotkey_by_event gboolean ibus_hotkey_profile_remove_hotkey_by_event
(IBusHotkeyProfile *profil e, (IBusHotkeyProfile *profil e,
GQuark event) ; GQuark event) ;
/**
* ibus_hotkey_profile_filter_key_event:
* @profile: An IBusHotkeyProfile.
* @keyval: Keycode of the hotkey.
* @modifiers: Modifiers of the hotkey.
* @prev_keyval: Keycode of the hotkey.
* @prev_modifiers: Modifiers of the hotkey.
* @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.
*
* Emit a <constant>::trigger</constant> signal when a hotkey is in a profi
le.
*
* @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);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 8 change blocks. 
0 lines changed or deleted 77 lines changed or added


 ibusinputcontext.h   ibusinputcontext.h 
skipping to change at line 20 skipping to change at line 20
* 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.
* *
* 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: ibusinputcontext
* @short_description: IBus input context proxy object.
* @stability: Stable
*
* An IBusInputContext is a proxy object of InputContext.
* Clients call the IBusInputContext to invoke InputContext,
* through which invoke IBusEngine.
*/
#ifndef __IBUS_INPUT_CONTEXT_H_ #ifndef __IBUS_INPUT_CONTEXT_H_
#define __IBUS_INPUT_CONTEXT_H_ #define __IBUS_INPUT_CONTEXT_H_
#include "ibusproxy.h" #include "ibusproxy.h"
/* /*
* Type macros. * Type macros.
*/ */
/* define GOBJECT macros */ /* define GOBJECT macros */
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 ibuslookuptable.h   ibuslookuptable.h 
skipping to change at line 80 skipping to change at line 80
struct _IBusLookupTable { struct _IBusLookupTable {
IBusSerializable parent; IBusSerializable parent;
/*< public >*/ /*< public >*/
guint page_size; guint page_size;
guint cursor_pos; guint cursor_pos;
gboolean cursor_visible; gboolean cursor_visible;
gboolean round; gboolean round;
GArray *candidates; GArray *candidates;
GArray *labels;
}; };
struct _IBusLookupTableClass { struct _IBusLookupTableClass {
IBusSerializableClass parent; IBusSerializableClass parent;
}; };
GType ibus_lookup_table_get_type (void); GType ibus_lookup_table_get_type (void);
/** /**
* ibus_lookup_table_new: * ibus_lookup_table_new:
* @page_size: number of candidate shown per page. * @page_size: number of candidate shown per page, the max value is 16.
* @cursor_pos: position index of cursor. * @cursor_pos: position index of cursor.
* @cursor_visible: whether the cursor is visible. * @cursor_visible: whether the cursor is visible.
* @round: TRUE for lookup table wrap around. * @round: TRUE for lookup table wrap around.
* @returns: A newly allocated IBusLookupTable. * @returns: A newly allocated IBusLookupTable.
* *
* New a IBusLookupTable. * New a IBusLookupTable.
*/ */
IBusLookupTable *ibus_lookup_table_new (guint page_s ize, IBusLookupTable *ibus_lookup_table_new (guint page_s ize,
guint cursor _pos, guint cursor _pos,
gboolean cursor _visible, gboolean cursor _visible,
skipping to change at line 127 skipping to change at line 128
* @index: Index in the Lookup table. * @index: Index in the Lookup table.
* @returns: IBusText at the given index; NULL if no such IBusText. * @returns: IBusText at the given index; NULL if no such IBusText.
* *
* Return IBusText at the given index. * Return IBusText at the given index.
*/ */
IBusText *ibus_lookup_table_get_candidate IBusText *ibus_lookup_table_get_candidate
(IBusLookupTable *table, (IBusLookupTable *table,
guint index) ; guint index) ;
/** /**
* ibus_lookup_table_append_label:
* @table: An IBusLookupTable.
* @text: candidate word/phrase to be appended (in IBusText format).
*
* Append a candidate word/phrase to IBusLookupTable.
*/
void ibus_lookup_table_append_label
(IBusLookupTable *table,
IBusText *text);
/**
* ibus_lookup_table_get_label:
* @table: An IBusLookupTable.
* @index: Index in the Lookup table.
* @returns: IBusText at the given index; NULL if no such IBusText.
*
* Return IBusText at the given index.
*/
IBusText *ibus_lookup_table_get_label
(IBusLookupTable *table,
guint index)
;
/**
* ibus_lookup_table_set_cursor_pos: * ibus_lookup_table_set_cursor_pos:
* @table: An IBusLookupTable. * @table: An IBusLookupTable.
* @cursor_pos: The position of cursor. * @cursor_pos: The position of cursor.
* *
* Set the cursor position of IBusLookupTable. * Set the cursor position of IBusLookupTable.
*/ */
void ibus_lookup_table_set_cursor_pos void ibus_lookup_table_set_cursor_pos
(IBusLookupTable *table, (IBusLookupTable *table,
guint cursor _pos); guint cursor _pos);
 End of changes. 3 change blocks. 
1 lines changed or deleted 26 lines changed or added


 ibusproxy.h   ibusproxy.h 
skipping to change at line 20 skipping to change at line 20
* 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.
* *
* 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: ibusproxy
* @short_description: Base proxy object.
* @stability: Stable
*
* An IBusProxy is the base of all proxy objects,
* which communicate the corresponding #IBusServices on the other end of IB
usConnection.
* For example, IBus clients (such as editors, web browsers) invoke the pro
xy object,
* IBusInputContext to communicate with the InputContext service of the ibu
s-daemon.
*
* Almost all services have corresponding proxies, except very simple servi
ces.
*/
#ifndef __IBUS_PROXY_H_ #ifndef __IBUS_PROXY_H_
#define __IBUS_PROXY_H_ #define __IBUS_PROXY_H_
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include "ibusobject.h" #include "ibusobject.h"
#include "ibusconnection.h" #include "ibusconnection.h"
#include "ibusmessage.h" #include "ibusmessage.h"
/* /*
* Type macros. * Type macros.
skipping to change at line 68 skipping to change at line 80
/* class members */ /* class members */
gboolean (* ibus_signal) (IBusProxy *proxy, gboolean (* ibus_signal) (IBusProxy *proxy,
IBusMessage *message); IBusMessage *message);
/*< private >*/ /*< private >*/
/* padding */ /* padding */
gpointer pdummy[7]; gpointer pdummy[7];
}; };
GType ibus_proxy_get_type (void); GType ibus_proxy_get_type (void);
/**
* ibus_proxy_new:
* @name: The service name of proxy object.
* @path: The path of proxy object.
* @connection: An IBusConnection.
* @returns: A newly allocated IBusProxy instance.
*
* New an IBusProxy instance.
* Property IBusProxy:name is set as @name, and
* IBusProxy:path is set as @path.
*/
IBusProxy *ibus_proxy_new (const gchar *name, IBusProxy *ibus_proxy_new (const gchar *name,
const gchar *path, const gchar *path,
IBusConnection *connection ); IBusConnection *connection );
/**
* ibus_proxy_send:
* @proxy: An IBusProxy.
* @message: The IBusMessage to be sent.
* @returns: TRUE if succeed; FALSE otherwise.
*
* Send an #IBusMessage to the corresponding service.
*
* @see_also ibus_proxy_call(), ibus_proxy_send_with_reply(), ibus_proxy_se
nd_with_reply_and_block().
*/
gboolean ibus_proxy_send (IBusProxy *proxy, gboolean ibus_proxy_send (IBusProxy *proxy,
IBusMessage *message); IBusMessage *message);
/**
* ibus_proxy_call:
* @proxy: An IBusProxy.
* @method: The method to be called.
* @first_arg_type: Type of first argument.
* @...: Rest of arguments, NULL to mark the end.
* @returns: TRUE if succeed; FALSE otherwise.
*
* Call a method of the corresponding service.
*
* @see_also ibus_proxy_send(), ibus_proxy_call_with_reply(), ibus_proxy_ca
ll_with_reply_and_block().
*/
gboolean ibus_proxy_call (IBusProxy *proxy, gboolean ibus_proxy_call (IBusProxy *proxy,
const gchar *method, const gchar *method,
GType first_agr_ type, GType first_arg_ type,
...); ...);
/**
* ibus_proxy_call_with_reply:
* @proxy: An IBusProxy.
* @method: The method to be called.
* @pending: Return location of a IBusPendingCall object, or NULL if connec
tion is disconnected.
* @timeout_milliseconds: Time out in milliseconds.
* @error: Returned error is stored here; NULL to ignore error.
* @first_arg_type: Type of first argument.
* @...: Rest of arguments, NULL to mark the end.
* @returns: TRUE if succeed; FALSE otherwise.
*
* Call a method of the corresponding service, and returns an IBusPendingCa
ll used to receive a reply to the message.
* This function calls ibus_connection_send_with_reply() to do the actual s
ending.
*
* @see_also: ibus_connection_send_with_reply(),
* @see_also: ibus_proxy_call(), ibus_proxy_send_with_reply(), ibus_proxy_c
all_with_reply_and_block().
*/
gboolean ibus_proxy_call_with_reply (IBusProxy *proxy, gboolean ibus_proxy_call_with_reply (IBusProxy *proxy,
const gchar *method, const gchar *method,
IBusPendingCall **pending, IBusPendingCall **pending,
gint timeout_mi lliseconds, gint timeout_mi lliseconds,
IBusError **error, IBusError **error,
GType first_arg_t ype, GType first_arg_t ype,
...); ...);
/**
* ibus_proxy_call_with_reply_and_block:
* @proxy: An IBusProxy.
* @method: The method to be called.
* @timeout_milliseconds: Time out in milliseconds.
* @error: Returned error is stored here; NULL to ignore error.
* @first_arg_type: Type of first argument.
* @...: 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.
*
* Call a method of the corresponding service and blocks a certain time per
iod while waiting for
* an IBusMessage as reply.
* If the IBusMessagwe is not NULL, it calls ibus_connection_send_with_rep
ly_and_block() to do the actual sending.
*
* @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().
*/
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,
...); ...);
/**
* ibus_proxy_send_with reply:
* @proxy: An IBusProxy.
* @message: The IBusMessage to be sent.
* @returns: TRUE if succeed; FALSE otherwise.
*
* Send an IBusMessage to the corresponding service and returns
* an IBusPendingCall used to receive a reply to the message.
* This function calls ibus_connection_send_with_reply() to do the actual s
ending.
*
* @see_also: ibus_connection_send_with_reply(),
* @see_also: ibus_proxy_send(), ibus_proxy_call_with_reply(), ibus_proxy_s
end_with_reply_and_block().
*/
gboolean ibus_proxy_send_with_reply (IBusProxy *proxy, gboolean ibus_proxy_send_with_reply (IBusProxy *proxy,
IBusMessage *message, IBusMessage *message,
IBusPendingCall **pending, IBusPendingCall **pending,
gint timeout_mi lliseconds); gint timeout_mi lliseconds);
/**
* ibus_proxy_send_with_reply_and_block:
* @proxy: An IBusProxy.
* @message: The IBusMessage to be sent.
* @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
* an IBusMessage as reply.
* If the IBusMessage is not NULL, it calls ibus_connection_send_with_repl
y_and_block() to do the actual sending.
*
* @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().
*/
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:
* @proxy: An IBusProxy.
* @message: The IBusMessage to be sent.
* @returns: TRUE if succeed; FALSE otherwise.
*
* Handle a signal by emitting IBusProxy::ibus-signal.
*
* If signal name is <constant>NameOwnerChanged</constant>
* and the service name is identical to the old name, then
* @proxy will be destroyed by ibus_object_destroy () and FALSE is returned
.
* Otherwise TRUE is returned.
*
* Note that if the path of of message is not identical to the IBusProxy:pa
th
* this function will not emit IBusProxy::ibus-signal.
*
*/
gboolean ibus_proxy_handle_signal (IBusProxy *proxy, gboolean ibus_proxy_handle_signal (IBusProxy *proxy,
IBusMessage *message); IBusMessage *message);
/**
* ibus_proxy_get_name:
* @proxy: An IBusProxy.
* @returns: The service name of the proxy object.
*
* Get the service name of a proxy object.
*/
const gchar *ibus_proxy_get_name (IBusProxy *proxy); const gchar *ibus_proxy_get_name (IBusProxy *proxy);
/**
* ibus_proxy_get_name:
* @proxy: An IBusProxy.
* @returns: The service name of the proxy object.
*
* Get the unique name of the proxy object.
*/
const gchar *ibus_proxy_get_unique_name (IBusProxy *proxy); const gchar *ibus_proxy_get_unique_name (IBusProxy *proxy);
/**
* ibus_proxy_get_path:
* @proxy: An IBusProxy.
* @returns: The path of proxy object.
*
* Get the path of a proxy object.
*/
const gchar *ibus_proxy_get_path (IBusProxy *proxy); const gchar *ibus_proxy_get_path (IBusProxy *proxy);
/**
* ibus_proxy_get_interface:
* @proxy: An IBusProxy.
* @returns: The service name of the proxy object.
*
* Get interface of a proxy object.
*/
const gchar *ibus_proxy_get_interface (IBusProxy *proxy); const gchar *ibus_proxy_get_interface (IBusProxy *proxy);
/**
* ibus_proxy_get_connection:
* @proxy: An IBusProxy.
* @returns: The connection of the proxy object.
*
* Get the connection of a proxy object.
*/
IBusConnection *ibus_proxy_get_connection (IBusProxy *proxy); IBusConnection *ibus_proxy_get_connection (IBusProxy *proxy);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 15 change blocks. 
1 lines changed or deleted 193 lines changed or added


 ibusservice.h   ibusservice.h 
skipping to change at line 58 skipping to change at line 58
#define IBUS_IS_SERVICE_CLASS(klass) \ #define IBUS_IS_SERVICE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_SERVICE)) (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_SERVICE))
#define IBUS_SERVICE_GET_CLASS(obj) \ #define IBUS_SERVICE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_SERVICE, IBusServiceClass) ) (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_SERVICE, IBusServiceClass) )
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _IBusService IBusService; typedef struct _IBusService IBusService;
typedef struct _IBusServiceClass IBusServiceClass; typedef struct _IBusServiceClass IBusServiceClass;
/**
* IBusService:
*
* An opaque data type representing an IBusService.
*/
struct _IBusService { struct _IBusService {
IBusObject parent; IBusObject parent;
/* instance members */ /* instance members */
}; };
typedef gboolean (* ServiceIBusMessageFunc) (IBusService *service, typedef gboolean (* ServiceIBusMessageFunc) (IBusService *service,
IBusConnection *connection , IBusConnection *connection ,
IBusMessage *message); IBusMessage *message);
typedef gboolean (* ServiceIBusSignalFunc) (IBusService *service, typedef gboolean (* ServiceIBusSignalFunc) (IBusService *service,
IBusConnection *connection , IBusConnection *connection ,
skipping to change at line 86 skipping to change at line 91
IBusMessage *message); IBusMessage *message);
gboolean (* ibus_signal) (IBusService *service, gboolean (* ibus_signal) (IBusService *service,
IBusConnection *connection, IBusConnection *connection,
IBusMessage *message); IBusMessage *message);
/*< private >*/ /*< private >*/
/* padding */ /* padding */
gpointer pdummy[6]; gpointer pdummy[6];
}; };
GType ibus_service_get_type (void); GType ibus_service_get_type (void);
/**
* ibus_service_new:
* @path: Object path.
* @returns: A newly allocated IBusService
*
* New an IBusService.
*/
IBusService *ibus_service_new (const gchar *path); IBusService *ibus_service_new (const gchar *path);
/**
* ibus_service_get_path:
* @service: An IBusService.
* @returns: The object path of @service
*
* Returns the object path of an IBusService.
*/
const gchar *ibus_service_get_path (IBusService *service); const gchar *ibus_service_get_path (IBusService *service);
/**
* ibus_service_handle_message:
* @service: An IBusService.
* @connection: Corresponding IBusCOnnection
* @message: IBusMessage to be handled.
* @returns: TRUE if succeed; FALSE otherwise.
*
* Emit an IBusMessage on an IBusConnection.
*/
gboolean ibus_service_handle_message (IBusService *service, gboolean ibus_service_handle_message (IBusService *service,
IBusConnection *connection , IBusConnection *connection ,
IBusMessage *message); IBusMessage *message);
/**
* ibus_service_add_to_connection:
* @service: An IBusService.
* @connection: Corresponding IBusCOnnection
* @returns: TRUE if succeed; FALSE otherwise.
*
* Add an IBus Service to an IBusConnection.
* This function also connects the service to the signal IBusConnection::de
stroy of the connection.
*/
gboolean ibus_service_add_to_connection (IBusService *service, gboolean ibus_service_add_to_connection (IBusService *service,
IBusConnection *connection ); IBusConnection *connection );
/**
* ibus_service_add_to_connection:
* @service: An IBusService.
* @connection: Corresponding IBusCOnnection
* @returns: TRUE if succeed; FALSE otherwise.
*
* Add an IBusService to an IBusConnection.
* This function also connects the service to the signal IBusConnection::de
stroy of the connection.
*/
GList *ibus_service_get_connections (IBusService *service); GList *ibus_service_get_connections (IBusService *service);
/**
* ibus_service_remove_from_connection:
* @service: An IBusService.
* @connection: Corresponding IBusCOnnection
* @returns: TRUE if succeed; FALSE otherwise.
*
* Remove an IBusService from an IBusConnection.
* This function also disconnects the signal IBusConnection::destroy.
*/
gboolean ibus_service_remove_from_connection gboolean ibus_service_remove_from_connection
(IBusService *service, (IBusService *service,
IBusConnection *connection ); IBusConnection *connection );
/**
* ibus_service_remove_from_all_connections:
* @service: An IBusService.
* @returns: TRUE if succeed; FALSE otherwise.
*
* Remove an IBusService from all connections.
* This function also disconnects the signal IBusConnection::destroy.
*/
gboolean ibus_service_remove_from_all_connections gboolean ibus_service_remove_from_all_connections
(IBusService *service); (IBusService *service);
/**
* ibus_service_send_signal:
* @service: An IBusService.
* @interface: The interface the signal is emitted from.
* @name: Name of the signal.
* @first_arg_type: Type of first argument.
* @...: Rest of arguments, NULL to mark the end.
* @returns: TRUE if succeed; FALSE otherwise.
*
* Send signal to all the IBusConnections of an IBusService.
*
* @see_also: ibus_connection_send_signal()
*/
gboolean ibus_service_send_signal (IBusService *service, gboolean ibus_service_send_signal (IBusService *service,
const gchar *interface, const gchar *interface,
const gchar *name, const gchar *name,
GType first_arg_ type, GType first_arg_ type,
...); ...);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 9 change blocks. 
0 lines changed or deleted 86 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/