atspi-accessible.h   atspi-accessible.h 
skipping to change at line 54 skipping to change at line 54
struct _AtspiAccessible struct _AtspiAccessible
{ {
AtspiObject parent; AtspiObject parent;
AtspiAccessible *accessible_parent; AtspiAccessible *accessible_parent;
GList *children; GList *children;
AtspiRole role; AtspiRole role;
gint interfaces; gint interfaces;
char *name; char *name;
char *description; char *description;
AtspiStateSet *states; AtspiStateSet *states;
GHashTable *attributes;
guint cached_properties; guint cached_properties;
}; };
typedef struct _AtspiAccessibleClass AtspiAccessibleClass; typedef struct _AtspiAccessibleClass AtspiAccessibleClass;
struct _AtspiAccessibleClass struct _AtspiAccessibleClass
{ {
AtspiObjectClass parent_class; AtspiObjectClass parent_class;
}; };
GType atspi_accessible_get_type (void); GType atspi_accessible_get_type (void);
skipping to change at line 100 skipping to change at line 101
AtspiStateSet * atspi_accessible_get_state_set (AtspiAccessible *obj); AtspiStateSet * atspi_accessible_get_state_set (AtspiAccessible *obj);
GHashTable * atspi_accessible_get_attributes (AtspiAccessible *obj, GError **error); GHashTable * atspi_accessible_get_attributes (AtspiAccessible *obj, GError **error);
GArray * atspi_accessible_get_attributes_as_array (AtspiAccessible *obj, GE rror **error); GArray * atspi_accessible_get_attributes_as_array (AtspiAccessible *obj, GE rror **error);
gchar * atspi_accessible_get_toolkit_name (AtspiAccessible *obj, GError **e rror); gchar * atspi_accessible_get_toolkit_name (AtspiAccessible *obj, GError **e rror);
gchar * atspi_accessible_get_toolkit_version (AtspiAccessible *obj, GError **error); gchar * atspi_accessible_get_toolkit_version (AtspiAccessible *obj, GError **error);
gchar * atspi_accessible_get_atspi_version (AtspiAccessible *obj, GError **
error);
gint atspi_accessible_get_id (AtspiAccessible *obj, GError **error); gint atspi_accessible_get_id (AtspiAccessible *obj, GError **error);
AtspiAccessible * atspi_accessible_get_application (AtspiAccessible *obj, G Error **error); AtspiAccessible * atspi_accessible_get_application (AtspiAccessible *obj, G Error **error);
AtspiAction * atspi_accessible_get_action (AtspiAccessible *obj); AtspiAction * atspi_accessible_get_action (AtspiAccessible *obj);
AtspiCollection * atspi_accessible_get_collection (AtspiAccessible *obj); AtspiCollection * atspi_accessible_get_collection (AtspiAccessible *obj);
AtspiComponent * atspi_accessible_get_component (AtspiAccessible *obj); AtspiComponent * atspi_accessible_get_component (AtspiAccessible *obj);
skipping to change at line 132 skipping to change at line 135
AtspiTable * atspi_accessible_get_table (AtspiAccessible *obj); AtspiTable * atspi_accessible_get_table (AtspiAccessible *obj);
AtspiText * atspi_accessible_get_text (AtspiAccessible *obj); AtspiText * atspi_accessible_get_text (AtspiAccessible *obj);
AtspiValue * atspi_accessible_get_value (AtspiAccessible *obj); AtspiValue * atspi_accessible_get_value (AtspiAccessible *obj);
GArray * atspi_accessible_get_interfaces (AtspiAccessible *obj); GArray * atspi_accessible_get_interfaces (AtspiAccessible *obj);
void atspi_accessible_set_cache_mask (AtspiAccessible *accessible, AtspiCac he mask); void atspi_accessible_set_cache_mask (AtspiAccessible *accessible, AtspiCac he mask);
void atspi_accessible_clear_cache (AtspiAccessible *accessible);
/* private */ /* private */
void _atspi_accessible_add_cache (AtspiAccessible *accessible, AtspiCache f lag); void _atspi_accessible_add_cache (AtspiAccessible *accessible, AtspiCache f lag);
AtspiCache _atspi_accessible_get_cache_mask (AtspiAccessible *accessible);
gboolean _atspi_accessible_test_cache (AtspiAccessible *accessible, AtspiCa
che flag);
#endif /* _ATSPI_ACCESSIBLE_H_ */ #endif /* _ATSPI_ACCESSIBLE_H_ */
 End of changes. 4 change blocks. 
0 lines changed or deleted 9 lines changed or added


 atspi-application.h   atspi-application.h 
skipping to change at line 28 skipping to change at line 28
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library 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.
*/ */
#ifndef _ATSPI_APPLICATION_H_ #ifndef _ATSPI_APPLICATION_H_
#define _ATSPI_APPLICATION_H_ #define _ATSPI_APPLICATION_H_
#include "glib-object.h" #include <dbus/dbus.h>
#include "atspi-accessible.h" #include "atspi-accessible.h"
#define ATSPI_TYPE_APPLICATION (atspi_application_ge t_type ()) #define ATSPI_TYPE_APPLICATION (atspi_application_ge t_type ())
#define ATSPI_APPLICATION(obj) (G_TYPE_CHECK_INSTANC E_CAST ((obj), ATSPI_TYPE_APPLICATION, AtspiApplication)) #define ATSPI_APPLICATION(obj) (G_TYPE_CHECK_INSTANC E_CAST ((obj), ATSPI_TYPE_APPLICATION, AtspiApplication))
#define ATSPI_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_C AST ((klass), ATSPI_TYPE_APPLICATION, AtspiAccessibleClass)) #define ATSPI_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_C AST ((klass), ATSPI_TYPE_APPLICATION, AtspiAccessibleClass))
#define ATSPI_IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANC E_TYPE ((obj), ATSPI_TYPE_APPLICATION)) #define ATSPI_IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANC E_TYPE ((obj), ATSPI_TYPE_APPLICATION))
#define ATSPI_IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_T YPE ((klass), ATSPI_TYPE_APPLICATION)) #define ATSPI_IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_T YPE ((klass), ATSPI_TYPE_APPLICATION))
#define ATSPI_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_ CLASS ((obj), ATSPI_TYPE_APPLICATION, AtspiAccessibleClass)) #define ATSPI_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_ CLASS ((obj), ATSPI_TYPE_APPLICATION, AtspiAccessibleClass))
typedef struct _AtspiApplication AtspiApplication; typedef struct _AtspiApplication AtspiApplication;
struct _AtspiApplication struct _AtspiApplication
{ {
GObject parent; GObject parent;
GHashTable *hash; GHashTable *hash;
char *bus_name; char *bus_name;
DBusConnection *bus; DBusConnection *bus;
struct _AtspiAccessible *root; struct _AtspiAccessible *root;
AtspiCache cache; AtspiCache cache;
gchar *toolkit_name;
gchar *toolkit_version;
gchar *atspi_version;
}; };
typedef struct _AtspiApplicationClass AtspiApplicationClass; typedef struct _AtspiApplicationClass AtspiApplicationClass;
struct _AtspiApplicationClass struct _AtspiApplicationClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
}; };
AtspiApplication * AtspiApplication *
_atspi_application_new (const char *bus_name); _atspi_application_new (const char *bus_name);
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 atspi-constants.h   atspi-constants.h 
skipping to change at line 762 skipping to change at line 762
/** /**
* ATSPI_ROLE_COUNT: * ATSPI_ROLE_COUNT:
* *
* 1 higher than the highest valid value of #AtspiRole. * 1 higher than the highest valid value of #AtspiRole.
*/ */
#define ATSPI_ROLE_COUNT (90+1) #define ATSPI_ROLE_COUNT (90+1)
typedef enum typedef enum
{ {
ATSPI_CACHE_NONE = 0x0001, ATSPI_CACHE_NONE = 0,
ATSPI_CACHE_PARENT = 0x0001, ATSPI_CACHE_PARENT = 1 << 0,
ATSPI_CACHE_CHILDREN = 0x0002, ATSPI_CACHE_CHILDREN = 1 << 1,
ATSPI_CACHE_NAME = 0x0004, ATSPI_CACHE_NAME = 1 << 2,
ATSPI_CACHE_DESCRIPTION = 0x0008, ATSPI_CACHE_DESCRIPTION = 1 << 3,
ATSPI_CACHE_STATES = 0x0010, ATSPI_CACHE_STATES = 1 << 4,
ATSPI_CACHE_ROLE = 0x0020, ATSPI_CACHE_ROLE = 1 << 5,
ATSPI_CACHE_INTERFACES = 0x0040, ATSPI_CACHE_INTERFACES = 1 << 6,
ATSPI_CACHE_ATTRIBUTES = 1 << 7,
ATSPI_CACHE_ALL = 0x3fffffff, ATSPI_CACHE_ALL = 0x3fffffff,
ATSPI_CACHE_UNDEFINED = 0x40000000 ATSPI_CACHE_DEFAULT = ATSPI_CACHE_PARENT | ATSPI_CACHE_CHILDREN |
ATSPI_CACHE_NAME | ATSPI_CACHE_DESCRIPTION |
ATSPI_CACHE_STATES | ATSPI_CACHE_ROLE |
ATSPI_CACHE_INTERFACES,
ATSPI_CACHE_UNDEFINED = 0x40000000,
} AtspiCache; } AtspiCache;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ATSPI_CONSTANTS_H_ */ #endif /* _ATSPI_CONSTANTS_H_ */
 End of changes. 2 change blocks. 
9 lines changed or deleted 14 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/