*** empty log message ***

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

diff --git a/test/at.c b/test/at.c
index 2e9a6fd..aa8e8c6 100644 (file)
--- a/test/at.c
+++ b/test/at.c
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -24,9 +25,8 @@
 #include <stdlib.h>
 #include <libbonobo.h>
 #include <libspi/Accessibility.h>
-#include "accessible.h"
-#include "listener.h"
-#include "desktop.h"
+#include <libspi/accessible.h>
+#include <libspi/listener.h>
 
 void
 check_ev (CORBA_Environment *ev, char *desc)
@@ -50,10 +50,10 @@ main(int argc, char **argv)
         CORBA_short n_desktops;
         CORBA_long j;
         CORBA_long n_apps;
-        Accessibility_SpiDesktop desktop;
-        Accessibility_SpiApplication app;
-
-        Accessibility_SpiRegistry registry;
+       CORBA_string s;
+        Accessibility_Desktop desktop;
+        Accessibility_Application app;
+        Accessibility_Registry registry;
         SpiListener *listener;
 
         CORBA_exception_init(&ev);
@@ -63,7 +63,7 @@ main(int argc, char **argv)
             g_error ("Could not initialize Bonobo");
           }
 
-        obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1";
+        obj_id = "OAFIID:Accessibility_Registry:1.0";
 
         oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev);
         if (ev._major != CORBA_NO_EXCEPTION) {
@@ -83,16 +83,16 @@ main(int argc, char **argv)
 
         listener = spi_listener_new ();
 
-        registry = (Accessibility_SpiRegistry) oclient;
+        registry = (Accessibility_Registry) oclient;
 
-        Accessibility_SpiRegistry_registerGlobalEventListener
+        Accessibility_Registry_registerGlobalEventListener
                                    (registry,
                                     (Accessibility_EventListener)
                                          bonobo_object_corba_objref (bonobo_object (listener)),
                                     "focus:",
                                     &ev);
         check_ev (&ev, "register:focus");
-        Accessibility_SpiRegistry_registerGlobalEventListener
+        Accessibility_Registry_registerGlobalEventListener
                                    (registry,
                                     (Accessibility_EventListener)
                                          bonobo_object_corba_objref (bonobo_object (listener)),
@@ -101,23 +101,25 @@ main(int argc, char **argv)
         check_ev (&ev, "register:button_press");
         fprintf (stderr, "AT callback registered.\n");
 
-            n_desktops = Accessibility_SpiRegistry_getDesktopCount (registry, &ev);
+            n_desktops = Accessibility_Registry_getDesktopCount (registry, &ev);
 
             for (i=0; i<n_desktops; ++i)
               {
-                desktop = Accessibility_SpiRegistry_getDesktop (registry, i, &ev);
-                fprintf (stderr, "desktop %d name: %s\n", i,
-                         Accessibility_SpiDesktop__get_name (desktop, &ev));
+                desktop = Accessibility_Registry_getDesktop (registry, i, &ev);
+               s = Accessibility_Desktop__get_name (desktop, &ev);
+                fprintf (stderr, "desktop %d name: %s\n", i, s);
+               CORBA_free (s);  
                 check_ev (&ev, "desktop:name");
-                n_apps = Accessibility_SpiDesktop__get_childCount (desktop, &ev);
+                n_apps = Accessibility_Desktop__get_childCount (desktop, &ev);
                 check_ev (&ev, "desktop:childCount");
                 fprintf (stderr, "desktop has %d apps:\n", n_apps);
                 for (j=0; j<n_apps; ++j)
                   {
-                    app = (Accessibility_SpiApplication) Accessibility_SpiDesktop_getChildAtIndex (desktop, j, &ev);
+                    app = (Accessibility_Application) Accessibility_Desktop_getChildAtIndex (desktop, j, &ev);
                     check_ev (&ev, "desktop:getChildAtIndex");
-                    fprintf (stderr, "app %d name: %s\n", j,
-                             Accessibility_SpiApplication__get_name (app, &ev));
+                    s = Accessibility_Application__get_name (app, &ev);
+                   fprintf (stderr, "app %d name: %s\n", j, s);
+                   CORBA_free (s);
                     check_ev (&ev, "app:getName");
                   }
               }