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
2002-03-27 Michael Meeks <michael@ximian.com>
[platform/core/uifw/at-spi2-atk.git]
/
libspi
/
base.c
diff --git
a/libspi/base.c
b/libspi/base.c
index
b4d19f8
..
7c602d6
100644
(file)
--- a/
libspi/base.c
+++ b/
libspi/base.c
@@
-20,7
+20,7
@@
* Boston, MA 02111-1307, USA.
*/
* Boston, MA 02111-1307, USA.
*/
-/*
object
.c: the base object managing an AtkObject proxy */
+/*
base
.c: the base object managing an AtkObject proxy */
#include <config.h>
#include <stdio.h>
#include <config.h>
#include <stdio.h>
@@
-40,11
+40,11
@@
spi_base_object_dispose (GObject *gobject)
{
SpiBase *object = SPI_BASE (gobject);
{
SpiBase *object = SPI_BASE (gobject);
- if (object->
atko
)
+ if (object->
gobj
)
{
{
- g_assert (
ATK_IS_OBJECT (object->atko
));
- g_object_unref (
G_OBJECT (object->atko)
);
- object->
atko
= NULL;
+ g_assert (
G_IS_OBJECT (object->gobj
));
+ g_object_unref (
object->gobj
);
+ object->
gobj
= NULL;
}
spi_base_parent_class->dispose (gobject);
}
spi_base_parent_class->dispose (gobject);
@@
-68,21
+68,19
@@
spi_base_init (SpiBase *object)
BONOBO_TYPE_FUNC (SpiBase, PARENT_TYPE, spi_base);
void
BONOBO_TYPE_FUNC (SpiBase, PARENT_TYPE, spi_base);
void
-spi_base_construct (SpiBase *object,
AtkObject *a
object)
+spi_base_construct (SpiBase *object,
GObject *g
object)
{
{
- object->
atko = g_object_ref (G_OBJECT (aobject)
);
+ object->
gobj = g_object_ref (gobject
);
}
void
spi_base_construct_default (SpiBase *object)
{
}
void
spi_base_construct_default (SpiBase *object)
{
- object->
atko = g_object_new (ATK
_TYPE_OBJECT, NULL);
+ object->
gobj = g_object_new (G
_TYPE_OBJECT, NULL);
}
}
-
Atk
Object *
-spi_base_get_
atk
object (SpiBase *object)
+
G
Object *
+spi_base_get_
g
object (SpiBase *object)
{
{
- g_return_val_if_fail (ATK_IS_OBJECT (object), NULL);
-
- return object->atko;
+ return object->gobj;
}
}