2001-11-13 Michael Meeks <michael@ximian.com>

[platform/core/uifw/at-spi2-atk.git] / at-bridge / bridge.c

diff --git a/at-bridge/bridge.c b/at-bridge/bridge.c
index f47d084..ba4f06a 100644 (file)
--- a/at-bridge/bridge.c
+++ b/at-bridge/bridge.c
@@ -41,7 +41,7 @@ struct _ArgStruct {
 
 static CORBA_Environment ev;
 static Accessibility_Registry registry;
-static Application *this_app;
+static SpiApplication *this_app;
 
 static gboolean bridge_register_app (gpointer p);
 static void bridge_focus_tracker (AtkObject *object);
@@ -83,7 +83,7 @@ bridge_register_app (gpointer gp)
     }
 
   /* Create the accesssible application server object */
-  this_app = application_new(atk_get_root ());
+  this_app = spi_application_new(atk_get_root ());
 
   obj_id = "OAFIID:Accessibility_Registry:proto0.1";
 
@@ -146,7 +146,7 @@ static void bridge_focus_tracker (AtkObject *object)
 {
   Accessibility_Event *e = Accessibility_Event__alloc();
   e->type = CORBA_string_dup ("focus:");
-  e->source = CORBA_Object_duplicate (BONOBO_OBJREF (accessible_new (object)), &ev);
+  e->source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (object)), &ev);
   e->detail1 = 0;
   e->detail2 = 0;
   Accessibility_Registry_notifyEvent (registry, e, &ev);
@@ -180,13 +180,13 @@ bridge_property_event_listener (GSignalInvocationHint *signal_hint,
   if (ATK_IS_IMPLEMENTOR (gobject))
   {
     aobject = atk_implementor_ref_accessible (ATK_IMPLEMENTOR (gobject));
-    source = CORBA_Object_duplicate (BONOBO_OBJREF (accessible_new (aobject)), &ev);
+    source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (aobject)), &ev);
     g_object_unref (G_OBJECT(aobject));
   }
   else if (ATK_IS_OBJECT (gobject))
   {
     aobject = ATK_OBJECT (gobject);
-    source = CORBA_Object_duplicate (BONOBO_OBJREF (accessible_new (aobject)), &ev);
+    source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (aobject)), &ev);
   }
   else
   {
@@ -242,7 +242,7 @@ bridge_signal_listener (GSignalInvocationHint *signal_hint,
   }
 
   snprintf(sbuf, APP_STATIC_BUFF_SZ, "%s:%s", name, g_type_name (signal_query.itype));
-  source =  CORBA_Object_duplicate (BONOBO_OBJREF (accessible_new (aobject)), &ev);
+  source =  CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (aobject)), &ev);
   e->type = CORBA_string_dup (sbuf);
   e->source = source;
   e->detail1 = 0;