2002-03-27 Michael Meeks <michael@ximian.com>

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

diff --git a/cspi/spi_main.c b/cspi/spi_main.c
index 0bc3a6c..ad9bd7b 100644 (file)
--- a/cspi/spi_main.c
+++ b/cspi/spi_main.c
@@ -14,7 +14,7 @@ static Accessibility_Registry registry = CORBA_OBJECT_NIL;
 static GHashTable *live_refs = NULL;
 
 static guint
-spi_object_hash (gconstpointer key)
+cspi_object_hash (gconstpointer key)
 {
   CORBA_Object object = (CORBA_Object) key;
   guint        retval;
@@ -25,7 +25,7 @@ spi_object_hash (gconstpointer key)
 }
 
 static gboolean
-spi_object_equal (gconstpointer a, gconstpointer b)
+cspi_object_equal (gconstpointer a, gconstpointer b)
 {
   CORBA_Object objecta = (CORBA_Object) a;
   CORBA_Object objectb = (CORBA_Object) b;
@@ -37,7 +37,7 @@ spi_object_equal (gconstpointer a, gconstpointer b)
 }
 
 static void
-spi_object_release (gpointer  value)
+cspi_object_release (gpointer  value)
 {
   Accessible *a = (Accessible *) value;
 
@@ -45,17 +45,16 @@ spi_object_release (gpointer  value)
   g_print ("releasing %p => %p\n", a, a->objref);
 #endif
 
-  bonobo_object_release_unref (a->objref, NULL);
+  cspi_release_unref (a->objref);
 
   memset (a, 0xaa, sizeof (Accessible));
   a->ref_count = -1;
 
 #ifndef DEBUG_OBJECTS
-  g_free (a);
+  free (a);
 #endif
 }
 
-
 SPIBoolean
 cspi_accessible_is_a (Accessible *obj,
                      const char *interface_name)
@@ -71,17 +70,17 @@ cspi_accessible_is_a (Accessible *obj,
   unknown = Bonobo_Unknown_queryInterface (CSPI_OBJREF (obj),
                                           interface_name, cspi_ev ());
 
-  if (BONOBO_EX (cspi_ev ()))
+  if (ev._major != CORBA_NO_EXCEPTION)
     {
       g_error ("Exception '%s' checking if is '%s'",
-              bonobo_exception_get_text (cspi_ev ()),
+              cspi_exception_get_text (),
               interface_name);
     }
 
   if (unknown != CORBA_OBJECT_NIL)
     {
       retval = TRUE;
-      bonobo_object_release_unref (unknown, NULL);
+      cspi_release_unref (unknown);
     }
   else
     {
@@ -92,14 +91,14 @@ cspi_accessible_is_a (Accessible *obj,
 }
 
 static GHashTable *
-get_live_refs (void)
+cspi_get_live_refs (void)
 {
   if (!live_refs) 
     {
-      live_refs = g_hash_table_new_full (spi_object_hash,
-                                        spi_object_equal,
+      live_refs = g_hash_table_new_full (cspi_object_hash,
+                                        cspi_object_equal,
                                         NULL,
-                                        spi_object_release);
+                                        cspi_object_release);
     }
   return live_refs;
 }
@@ -122,7 +121,7 @@ cspi_exception (void)
 {
   SPIBoolean retval;
 
-  if (BONOBO_EX (&ev))
+  if (ev._major != CORBA_NO_EXCEPTION)
     {
       CORBA_exception_free (&ev);
       retval = TRUE;
@@ -150,18 +149,18 @@ cspi_object_add (CORBA_Object corba_object)
     }
   else
     {
-      if ((ref = g_hash_table_lookup (get_live_refs (), corba_object)))
+      if ((ref = g_hash_table_lookup (cspi_get_live_refs (), corba_object)))
         {
           g_assert (ref->ref_count > 0);
          ref->ref_count++;
-          bonobo_object_release_unref (corba_object, NULL);
+          cspi_release_unref (corba_object);
 #ifdef DEBUG_OBJECTS
           g_print ("returning cached %p => %p\n", ref, ref->objref);
 #endif
        }
       else
         {
-          ref = g_new (Accessible, 1);
+          ref = malloc (sizeof (Accessible));
 
 #ifdef DEBUG_OBJECTS
           g_print ("allocating %p => %p\n", ref, corba_object);
@@ -170,7 +169,7 @@ cspi_object_add (CORBA_Object corba_object)
           ref->objref = corba_object;
           ref->ref_count = 1;
 
-          g_hash_table_insert (get_live_refs (), ref->objref, ref);
+          g_hash_table_insert (cspi_get_live_refs (), ref->objref, ref);
        }
     }
 
@@ -195,7 +194,7 @@ cspi_object_unref (Accessible *accessible)
 
   if (--accessible->ref_count == 0)
     {
-      g_hash_table_remove (get_live_refs (), accessible->objref);
+      g_hash_table_remove (cspi_get_live_refs (), accessible->objref);
     }
 }
 
@@ -213,7 +212,7 @@ cspi_cleanup (void)
 
   if (registry != CORBA_OBJECT_NIL)
     {
-      bonobo_object_release_unref (registry, NULL);
+      cspi_release_unref (registry);
       registry = CORBA_OBJECT_NIL;
     }
 }
@@ -230,9 +229,6 @@ static gboolean SPI_inited = FALSE;
 int
 SPI_init (void)
 {
-  int argc = 0;
-  char *obj_id;
-
   if (SPI_inited)
     {
       return 1;
@@ -242,28 +238,7 @@ SPI_init (void)
 
   CORBA_exception_init (&ev);
 
-  if (!bonobo_init (&argc, NULL))
-    {
-      g_error ("Could not initialize Bonobo");
-    }
-
-  obj_id = "OAFIID:Accessibility_Registry:proto0.1";
-
-  registry = bonobo_activation_activate_from_id (
-         obj_id, 0, NULL, cspi_ev ());
-
-  if (ev._major != CORBA_NO_EXCEPTION)
-    {
-      g_error ("AT-SPI error: during registry activation: %s\n",
-              bonobo_exception_get_text (cspi_ev ()));
-    }
-
-  if (registry == CORBA_OBJECT_NIL)
-    {
-      g_error ("Could not locate registry");
-    }
-
-  bonobo_activate ();
+  registry = cspi_init ();
 
   g_atexit (cspi_cleanup);
   
@@ -282,7 +257,7 @@ SPI_init (void)
 void
 SPI_event_main (void)
 {
-  bonobo_main ();
+  cspi_main ();
 }
 
 /**
@@ -294,7 +269,7 @@ SPI_event_main (void)
 void
 SPI_event_quit (void)
 {
-  bonobo_main_quit ();
+  cspi_main_quit ();
 }
 
 /**
@@ -374,3 +349,18 @@ SPI_exit (void)
 
   return leaked;
 }
+
+/**
+ * SPI_freeString:
+ * @s: a character string returned from another at-spi call.
+ *
+ * Free a character string returned from an at-spi call.  Clients of
+ * at-spi should use this function instead of free () or g_free().
+ * This API should not be used to free strings
+ * from other libraries or allocated by the client.
+ **/
+void
+SPI_freeString (char *s)
+{
+  CORBA_free (s);
+}