X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Ftext.c;h=b32223912abf7c44879f2be2aa3b15edf23987b8;hb=42bec7927aea61be20b65fbfa155a74e3e8b4e3e;hp=bc74e26269d01afbf58aab0776d5b8dbdae9f042;hpb=fd46827d0ef868929e7c255334b73adf2e305a85;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/text.c b/libspi/text.c
index bc74e26..b322239 100644
--- a/libspi/text.c
+++ b/libspi/text.c
@@ -36,12 +36,9 @@ get_text_from_servant (PortableServer_Servant servant)
 {
   SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
 
-  if (!object)
-    {
-      return NULL;
-    }
-
-  return ATK_TEXT (object->atko);
+  g_return_val_if_fail (object, NULL);
+  g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL);
+  return ATK_TEXT (object->gobj);
 }
 
 static CORBA_string
@@ -406,9 +403,10 @@ BONOBO_TYPE_FUNC_FULL (SpiText,
 void
 spi_text_construct (SpiText *text, AtkObject *obj)
 {
-  spi_base_construct (SPI_BASE (text), obj);
+  spi_base_construct (SPI_BASE (text), G_OBJECT(obj));
 }
 
+
 SpiText *
 spi_text_interface_new (AtkObject *obj)
 {