projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* libspi/accessible.c (spi_init_role_lookup_table): Correct typos
[platform/core/uifw/at-spi2-atk.git]
/
libspi
/
accessible.c
diff --git
a/libspi/accessible.c
b/libspi/accessible.c
index
cd4f9b1
..
e355444
100644
(file)
--- a/
libspi/accessible.c
+++ b/
libspi/accessible.c
@@
-2,7
+2,8
@@
* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@
-62,7
+63,7
@@
spi_init_role_lookup_table (Accessibility_Role *role_table)
role_table [ATK_ROLE_DIAL] = Accessibility_ROLE_DIAL;
role_table [ATK_ROLE_DIALOG] = Accessibility_ROLE_DIALOG;
role_table [ATK_ROLE_DIRECTORY_PANE] = Accessibility_ROLE_DIRECTORY_PANE;
role_table [ATK_ROLE_DIAL] = Accessibility_ROLE_DIAL;
role_table [ATK_ROLE_DIALOG] = Accessibility_ROLE_DIALOG;
role_table [ATK_ROLE_DIRECTORY_PANE] = Accessibility_ROLE_DIRECTORY_PANE;
- role_table
[ATK_ROLE_DRAWING_AREA] =
Accessibility_ROLE_DRAWING_AREA;
+ role_table
[ATK_ROLE_DRAWING_AREA] =
Accessibility_ROLE_DRAWING_AREA;
role_table [ATK_ROLE_FILE_CHOOSER] = Accessibility_ROLE_FILE_CHOOSER;
role_table [ATK_ROLE_FILLER] = Accessibility_ROLE_FILLER;
role_table [ATK_ROLE_FONT_CHOOSER] = Accessibility_ROLE_FONT_CHOOSER;
role_table [ATK_ROLE_FILE_CHOOSER] = Accessibility_ROLE_FILE_CHOOSER;
role_table [ATK_ROLE_FILLER] = Accessibility_ROLE_FILLER;
role_table [ATK_ROLE_FONT_CHOOSER] = Accessibility_ROLE_FONT_CHOOSER;
@@
-100,8
+101,8
@@
spi_init_role_lookup_table (Accessibility_Role *role_table)
role_table [ATK_ROLE_STATUSBAR] = Accessibility_ROLE_STATUS_BAR;
role_table [ATK_ROLE_TABLE] = Accessibility_ROLE_TABLE;
role_table [ATK_ROLE_TABLE_CELL] = Accessibility_ROLE_TABLE_CELL;
role_table [ATK_ROLE_STATUSBAR] = Accessibility_ROLE_STATUS_BAR;
role_table [ATK_ROLE_TABLE] = Accessibility_ROLE_TABLE;
role_table [ATK_ROLE_TABLE_CELL] = Accessibility_ROLE_TABLE_CELL;
- role_table [ATK_ROLE_TABLE_COLUMN_HEADER] = Accessibility_ROLE_COLUMN_HEADER;
- role_table [ATK_ROLE_TABLE_ROW_HEADER] = Accessibility_ROLE_ROW_HEADER;
+ role_table [ATK_ROLE_TABLE_COLUMN_HEADER] = Accessibility_ROLE_
TABLE_
COLUMN_HEADER;
+ role_table [ATK_ROLE_TABLE_ROW_HEADER] = Accessibility_ROLE_
TABLE_
ROW_HEADER;
role_table [ATK_ROLE_TEAR_OFF_MENU_ITEM] = Accessibility_ROLE_TEAROFF_MENU_ITEM;
role_table [ATK_ROLE_TERMINAL] = Accessibility_ROLE_TERMINAL;
role_table [ATK_ROLE_TEXT] = Accessibility_ROLE_TEXT;
role_table [ATK_ROLE_TEAR_OFF_MENU_ITEM] = Accessibility_ROLE_TEAROFF_MENU_ITEM;
role_table [ATK_ROLE_TERMINAL] = Accessibility_ROLE_TERMINAL;
role_table [ATK_ROLE_TEXT] = Accessibility_ROLE_TEXT;
@@
-306,13
+307,20
@@
impl_accessibility_accessible_get_state (PortableServer_Servant servant,
CORBA_Environment *ev)
{
AtkObject *object = get_atkobject_from_servant (servant);
CORBA_Environment *ev)
{
AtkObject *object = get_atkobject_from_servant (servant);
+ AtkStateSet *atk_set;
+ SpiStateSet *set;
+ Accessibility_StateSet retval;
bonobo_return_val_if_fail (object != NULL, NULL, ev);
bonobo_return_val_if_fail (object != NULL, NULL, ev);
- printf ("SpiAccessible get_state.\n");
+ atk_set = atk_object_ref_state_set (object);
+
+ set = spi_state_set_new (atk_set);
+ retval = bonobo_object_dup_ref (
+ BONOBO_OBJREF(set),
+ ev);
- /* TODO: implement the bonobo stateset class */
- return (Accessibility_StateSet) NULL;
+ return retval;
}
/*
}
/*
@@
-377,6
+385,7
@@
static CORBA_char *
impl_accessibility_accessible_get_role_name (PortableServer_Servant servant,
CORBA_Environment *ev)
{
impl_accessibility_accessible_get_role_name (PortableServer_Servant servant,
CORBA_Environment *ev)
{
+ const gchar *role_name;
AtkRole role;
AtkObject *object = get_atkobject_from_servant (servant);
AtkRole role;
AtkObject *object = get_atkobject_from_servant (servant);
@@
-384,7
+393,11
@@
impl_accessibility_accessible_get_role_name (PortableServer_Servant servant,
role = atk_object_get_role (object);
role = atk_object_get_role (object);
- return CORBA_string_dup (atk_role_get_name (role));
+ role_name = atk_role_get_name (role);
+ if (role_name)
+ return CORBA_string_dup (role_name);
+ else
+ return CORBA_string_dup ("");
}
static void
}
static void