X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Fbase.c;h=25bd4b37028322aa0169cda07cbab2950621ada1;hb=5d01be6ec7d2cb2e662c695bd4c28c50ac3f2dab;hp=b4d19f8ae928a378cea8b7185b5cb15f586e1732;hpb=fd46827d0ef868929e7c255334b73adf2e305a85;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/libspi/base.c b/libspi/base.c index b4d19f8..25bd4b3 100644 --- a/libspi/base.c +++ b/libspi/base.c @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ -/* object.c: the base object managing an AtkObject proxy */ +/* base.c: the base object managing an AtkObject proxy */ #include #include @@ -40,11 +40,11 @@ spi_base_object_dispose (GObject *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); @@ -63,26 +63,26 @@ spi_base_class_init (SpiBaseClass *klass) static void spi_base_init (SpiBase *object) { + object->gobj = NULL; } -BONOBO_TYPE_FUNC (SpiBase, PARENT_TYPE, spi_base); +BONOBO_TYPE_FUNC (SpiBase, PARENT_TYPE, spi_base) void -spi_base_construct (SpiBase *object, AtkObject *aobject) +spi_base_construct (SpiBase *object, GObject *gobject) { - object->atko = g_object_ref (G_OBJECT (aobject)); + g_return_if_fail (G_IS_OBJECT (gobject)); + object->gobj = g_object_ref (gobject); } 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); } -AtkObject * -spi_base_get_atkobject (SpiBase *object) +GObject * +spi_base_get_gobject (SpiBase *object) { - g_return_val_if_fail (ATK_IS_OBJECT (object), NULL); - - return object->atko; + return object->gobj; }