atspi-constants.h   atspi-constants.h 
skipping to change at line 1032 skipping to change at line 1032
* how the data is being presented. The @ATSPI_LABELLED_BY relation is * how the data is being presented. The @ATSPI_LABELLED_BY relation is
* particularly important in interpreting objects of this type, as is the * particularly important in interpreting objects of this type, as is the
* accessible description property. See @ATSPI_ROLE_CAPTION. * accessible description property. See @ATSPI_ROLE_CAPTION.
* @ATSPI_ROLE_CAPTION: The object contains descriptive information, usuall y * @ATSPI_ROLE_CAPTION: The object contains descriptive information, usuall y
* textual, about another user interface element such as a table, chart, or * textual, about another user interface element such as a table, chart, or
* image. * image.
* @ATSPI_ROLE_DOCUMENT_FRAME: The object is a visual frame or container wh ich * @ATSPI_ROLE_DOCUMENT_FRAME: The object is a visual frame or container wh ich
* contains a view of document content. #AtspiDocument frames may occur wit hin * contains a view of document content. #AtspiDocument frames may occur wit hin
* another #AtspiDocument instance, in which case the second document may be * another #AtspiDocument instance, in which case the second document may be
* said to be embedded in the containing instance. HTML frames are often * said to be embedded in the containing instance. HTML frames are often
* @ATSPI_ROLE_DOCUMENT_FRAME: Either this object, or a singleton descenda nt, * ATSPI_ROLE_DOCUMENT_FRAME: Either this object, or a singleton descendan t,
* should implement the #AtspiDocument interface. * should implement the #AtspiDocument interface.
* @ATSPI_ROLE_HEADING: The object serves as a heading for content which * @ATSPI_ROLE_HEADING: The object serves as a heading for content which
* follows it in a document. The 'heading level' of the heading, if * follows it in a document. The 'heading level' of the heading, if
* availabe, may be obtained by querying the object's attributes. * availabe, may be obtained by querying the object's attributes.
* @ATSPI_ROLE_PAGE: The object is a containing instance which encapsulates a * @ATSPI_ROLE_PAGE: The object is a containing instance which encapsulates a
* page of information. @ATSPI_ROLE_PAGE is used in documents and content w hich * page of information. @ATSPI_ROLE_PAGE is used in documents and content w hich
* support a paginated navigation model. * support a paginated navigation model.
* @ATSPI_ROLE_SECTION: The object is a containing instance of document con tent * @ATSPI_ROLE_SECTION: The object is a containing instance of document con tent
* which constitutes a particular 'logical' section of the document. The * which constitutes a particular 'logical' section of the document. The
* type of content within a section, and the nature of the section division * type of content within a section, and the nature of the section division
skipping to change at line 1233 skipping to change at line 1233
ATSPI_CACHE_NONE = 0, ATSPI_CACHE_NONE = 0,
ATSPI_CACHE_PARENT = 1 << 0, ATSPI_CACHE_PARENT = 1 << 0,
ATSPI_CACHE_CHILDREN = 1 << 1, ATSPI_CACHE_CHILDREN = 1 << 1,
ATSPI_CACHE_NAME = 1 << 2, ATSPI_CACHE_NAME = 1 << 2,
ATSPI_CACHE_DESCRIPTION = 1 << 3, ATSPI_CACHE_DESCRIPTION = 1 << 3,
ATSPI_CACHE_STATES = 1 << 4, ATSPI_CACHE_STATES = 1 << 4,
ATSPI_CACHE_ROLE = 1 << 5, ATSPI_CACHE_ROLE = 1 << 5,
ATSPI_CACHE_INTERFACES = 1 << 6, ATSPI_CACHE_INTERFACES = 1 << 6,
ATSPI_CACHE_ATTRIBUTES = 1 << 7, ATSPI_CACHE_ATTRIBUTES = 1 << 7,
ATSPI_CACHE_ALL = 0x3fffffff, ATSPI_CACHE_ALL = 0x3fffffff,
ATSPI_CACHE_DEFAULT = ATSPI_CACHE_PARENT | ATSPI_CACHE_CHILDREN | ATSPI_CACHE_DEFAULT = ATSPI_CACHE_PARENT | ATSPI_CACHE_CHILDREN | ATSPI_C
ATSPI_CACHE_NAME | ATSPI_CACHE_DESCRIPTION | ACHE_NAME | ATSPI_CACHE_DESCRIPTION | ATSPI_CACHE_STATES | ATSPI_CACHE_ROLE
ATSPI_CACHE_STATES | ATSPI_CACHE_ROLE | | ATSPI_CACHE_INTERFACES,
ATSPI_CACHE_INTERFACES,
ATSPI_CACHE_UNDEFINED = 0x40000000, ATSPI_CACHE_UNDEFINED = 0x40000000,
} AtspiCache; } AtspiCache;
#define ATSPI_DBUS_NAME_REGISTRY "org.a11y.atspi.Registry" #define ATSPI_DBUS_NAME_REGISTRY "org.a11y.atspi.Registry"
#define ATSPI_DBUS_PATH_REGISTRY "/org/a11y/atspi/registry" #define ATSPI_DBUS_PATH_REGISTRY "/org/a11y/atspi/registry"
#define ATSPI_DBUS_INTERFACE_REGISTRY "org.a11y.atspi.Registry" #define ATSPI_DBUS_INTERFACE_REGISTRY "org.a11y.atspi.Registry"
#define ATSPI_DBUS_PATH_NULL "/org/a11y/atspi/null" #define ATSPI_DBUS_PATH_NULL "/org/a11y/atspi/null"
#define ATSPI_DBUS_PATH_ROOT "/org/a11y/atspi/accessible/root" #define ATSPI_DBUS_PATH_ROOT "/org/a11y/atspi/accessible/root"
 End of changes. 2 change blocks. 
5 lines changed or deleted 4 lines changed or added


 atspi-device-listener.h   atspi-device-listener.h 
skipping to change at line 35 skipping to change at line 35
#ifndef _ATSPI_DEVICE_LISTENER_H_ #ifndef _ATSPI_DEVICE_LISTENER_H_
#define _ATSPI_DEVICE_LISTENER_H_ #define _ATSPI_DEVICE_LISTENER_H_
#include "glib-object.h" #include "glib-object.h"
#include "atspi-types.h" #include "atspi-types.h"
G_BEGIN_DECLS G_BEGIN_DECLS
GType atspi_device_event_get_type (void);
/** /**
* AtspiDeviceListenerCB: * AtspiDeviceListenerCB:
* @stroke: (transfer full): The #AtspiDeviceEvent for which notification i s * @stroke: (transfer full): The #AtspiDeviceEvent for which notification i s
* being received. * being received.
* @user_data: Data which is passed to the client each time this callback i s notified. * @user_data: Data which is passed to the client each time this callback i s notified.
* *
* A callback function prototype via which clients receive device event not ifications. * A callback function prototype via which clients receive device event not ifications.
* *
* Returns: #TRUE if the client wishes to consume/preempt the event, preven ting it from being * Returns: #TRUE if the client wishes to consume/preempt the event, preven ting it from being
* relayed to the currently focussed application, #FALSE if the event deliv ery should proceed as normal. * relayed to the currently focussed application, #FALSE if the event deliv ery should proceed as normal.
skipping to change at line 80 skipping to change at line 82
{ {
GObject parent; GObject parent;
guint id; guint id;
GList *callbacks; GList *callbacks;
}; };
typedef struct _AtspiDeviceListenerClass AtspiDeviceListenerClass; typedef struct _AtspiDeviceListenerClass AtspiDeviceListenerClass;
struct _AtspiDeviceListenerClass struct _AtspiDeviceListenerClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
gboolean (*device_event) (AtspiDeviceListener *, const AtspiDeviceEvent * ); gboolean (*device_event) (AtspiDeviceListener *listener, const AtspiDevic eEvent *event);
}; };
GType atspi_device_listener_get_type (void); GType atspi_device_listener_get_type (void);
AtspiDeviceListener *atspi_device_listener_new (AtspiDeviceListenerCB callb ack, void *user_data, GDestroyNotify callback_destroyed); AtspiDeviceListener *atspi_device_listener_new (AtspiDeviceListenerCB callb ack, void *user_data, GDestroyNotify callback_destroyed);
AtspiDeviceListener *atspi_device_listener_new_simple (AtspiDeviceListenerS impleCB callback, GDestroyNotify callback_destroyed); AtspiDeviceListener *atspi_device_listener_new_simple (AtspiDeviceListenerS impleCB callback, GDestroyNotify callback_destroyed);
void atspi_device_listener_add_callback (AtspiDeviceListener *listener, Ats piDeviceListenerCB callback, GDestroyNotify callback_destroyed, void *user_ data); void atspi_device_listener_add_callback (AtspiDeviceListener *listener, Ats piDeviceListenerCB callback, GDestroyNotify callback_destroyed, void *user_ data);
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 atspi-event-listener.h   atspi-event-listener.h 
skipping to change at line 45 skipping to change at line 45
GType atspi_event_get_type (void); GType atspi_event_get_type (void);
/** /**
* AtspiEventListenerCB: * AtspiEventListenerCB:
* @event: (transfer full): The event for which notification is sent. * @event: (transfer full): The event for which notification is sent.
* @user_data: User data which is passed to the callback each time a notifi cation takes place. * @user_data: User data which is passed to the callback each time a notifi cation takes place.
* *
* A function prototype for callbacks via which clients are notified of AT- SPI events. * A function prototype for callbacks via which clients are notified of AT- SPI events.
* *
**/ **/
typedef void (*AtspiEventListenerCB) (const AtspiEvent *event , typedef void (*AtspiEventListenerCB) (AtspiEvent *event,
void *user_data); void *user_data);
/** /**
* AtspiEventListenerSimpleCB: * AtspiEventListenerSimpleCB:
* @event: (transfer full): The event for which notification is sent. * @event: (transfer full): The event for which notification is sent.
* *
* Like #AtspiEventlistenerCB, but with no user_data. * Like #AtspiEventlistenerCB, but with no user_data.
* *
**/ **/
typedef void (*AtspiEventListenerSimpleCB) (const AtspiEvent *event); typedef void (*AtspiEventListenerSimpleCB) (const AtspiEvent *event);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 atspi-gmain.c   atspi-gmain.c 
skipping to change at line 37 skipping to change at line 37
#include <config.h> #include <config.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include "glib.h" #include "glib.h"
#include <string.h> #include <string.h>
#include <libintl.h> #include <libintl.h>
#define _(x) dgettext (GETTEXT_PACKAGE, x) #define _(x) dgettext (GETTEXT_PACKAGE, x)
#define N_(x) x #define N_(x) x
/** /**
* @defgroup DBusGLibInternals GLib bindings implementation details
* @ingroup DBusInternals
* @brief Implementation details of GLib bindings
*
* @{
*/
/**
* DBusGMessageQueue: * DBusGMessageQueue:
* A GSource subclass for dispatching DBusConnection messages. * A GSource subclass for dispatching DBusConnection messages.
* We need this on top of the IO handlers, because sometimes * We need this on top of the IO handlers, because sometimes
* there are messages to dispatch queued up but no IO pending. * there are messages to dispatch queued up but no IO pending.
*/ */
typedef struct typedef struct
{ {
GSource source; /**< the parent GSource */ GSource source; /**< the parent GSource */
DBusConnection *connection; /**< the connection to dispatch */ DBusConnection *connection; /**< the connection to dispatch */
} DBusGMessageQueue; } DBusGMessageQueue;
skipping to change at line 521 skipping to change at line 513
TimeoutHandler *handler = old->timeouts->data; TimeoutHandler *handler = old->timeouts->data;
connection_setup_add_timeout (cs, handler->timeout); connection_setup_add_timeout (cs, handler->timeout);
} }
return cs; return cs;
} }
/** @} */ /* End of GLib bindings internals */ /** @} */ /* End of GLib bindings internals */
/** @addtogroup DBusGLib
* @{
*/
/** /**
* atspi_dbus_connection_setup_with_g_main: * atspi_dbus_connection_setup_with_g_main: (skip)
* @connection: the connection * @connection: the connection
* @context: the #GMainContext or #NULL for default context * @context: the #GMainContext or #NULL for default context
* *
* Sets the watch and timeout functions of a #DBusConnection * Sets the watch and timeout functions of a #DBusConnection
* to integrate the connection with the GLib main loop. * to integrate the connection with the GLib main loop.
* Pass in #NULL for the #GMainContext unless you're * Pass in #NULL for the #GMainContext unless you're
* doing something specialized. * doing something specialized.
* *
* If called twice for the same context, does nothing the second * If called twice for the same context, does nothing the second
* time. If called once with context A and once with context B, * time. If called once with context A and once with context B,
skipping to change at line 604 skipping to change at line 592
wakeup_main, wakeup_main,
cs, NULL); cs, NULL);
return; return;
nomem: nomem:
g_error ("Not enough memory to set up DBusConnection for use with GLib"); g_error ("Not enough memory to set up DBusConnection for use with GLib");
} }
/** /**
* atspi_dbus_server_setup_with_g_main: * atspi_dbus_server_setup_with_g_main: (skip)
* @server: the server * @server: the server
* @context: the #GMainContext or #NULL for default * @context: the #GMainContext or #NULL for default
* *
* Sets the watch and timeout functions of a #DBusServer * Sets the watch and timeout functions of a #DBusServer
* to integrate the server with the GLib main loop. * to integrate the server with the GLib main loop.
* In most cases the context argument should be #NULL. * In most cases the context argument should be #NULL.
* *
* If called twice for the same context, does nothing the second * If called twice for the same context, does nothing the second
* time. If called once with context A and once with context B, * time. If called once with context A and once with context B,
* context B replaces context A as the context monitoring the * context B replaces context A as the context monitoring the
 End of changes. 4 change blocks. 
14 lines changed or deleted 2 lines changed or added


 atspi-types.h   atspi-types.h 
skipping to change at line 94 skipping to change at line 94
struct _AtspiEvent struct _AtspiEvent
{ {
gchar *type; gchar *type;
AtspiAccessible *source; AtspiAccessible *source;
gint detail1; gint detail1;
gint detail2; gint detail2;
GValue any_data; GValue any_data;
}; };
/** /**
* ATSPI_TYPE_RECT: * ATSPI_TYPE_DEVICE_EVENT:
*
* The #GType for a boxed type holding a #AtspiDeviceEvent.
*/
#define ATSPI_TYPE_DEVICE_EVENT (atspi_device_event_get_type ())
/**
* ATSPI_TYPE_EVENT:
* *
* The #GType for a boxed type holding a #AtspiEvent. * The #GType for a boxed type holding a #AtspiEvent.
*/ */
#define ATSPI_TYPE_EVENT (atspi_event_get_type ()) #define ATSPI_TYPE_EVENT (atspi_event_get_type ())
typedef void AtspiKeystrokeListener; typedef void AtspiKeystrokeListener;
/** /**
* AtspiKeySet: * AtspiKeySet:
* @keysyms: * @keysyms:
 End of changes. 1 change blocks. 
1 lines changed or deleted 8 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/