2001-08-15 Mark McLoughlin <mark@skynet.ie>

        * at-bridge/Makefile.am: link against
        ../libspi/libspi.la instead of -lspi.

        * at-spi/test/app.c: include
        bonobo-activation.h. Use a default appname
        if one is not provided.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@20 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index e4b284a..32aec98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-15  Mark McLoughlin <mark@skynet.ie>
+
+       * at-bridge/Makefile.am: link against
+       ../libspi/libspi.la instead of -lspi.
+
+       * at-spi/test/app.c: include 
+       bonobo-activation.h. Use a default appname
+       if one is not provided.
+
 2001-08-14  Bill Haneman <bill.haneman@sun.com>
 
        * idl/Registry.idl : temporarily changed register_Application

diff --git a/at-bridge/Makefile.am b/at-bridge/Makefile.am
index 8a09107..c5d984e 100644 (file)
--- a/at-bridge/Makefile.am
+++ b/at-bridge/Makefile.am
@@ -22,6 +22,6 @@ DEPS =        \
 LDFLAGS = -no-undefined        \
        @DEP_LIBS@
 
-libat_bridge_la_LIBADD = $(AT_BRIDGE_LIBS) -lspi
+libat_bridge_la_LIBADD = $(AT_BRIDGE_LIBS) ../libspi/libspi.la
 
 CFLAGS += $(AT_BRIDGE_CFLAGS)

diff --git a/atk-bridge/Makefile.am b/atk-bridge/Makefile.am
index 8a09107..c5d984e 100644 (file)
--- a/atk-bridge/Makefile.am
+++ b/atk-bridge/Makefile.am
@@ -22,6 +22,6 @@ DEPS =        \
 LDFLAGS = -no-undefined        \
        @DEP_LIBS@
 
-libat_bridge_la_LIBADD = $(AT_BRIDGE_LIBS) -lspi
+libat_bridge_la_LIBADD = $(AT_BRIDGE_LIBS) ../libspi/libspi.la
 
 CFLAGS += $(AT_BRIDGE_CFLAGS)

diff --git a/test/app.c b/test/app.c
index 1dfafdc..1b5566e 100644 (file)
--- a/test/app.c
+++ b/test/app.c
@@ -23,11 +23,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <libbonobo.h>
+#include <bonobo-activation/bonobo-activation.h>
 #include <atk/atkobject.h>
 #include <libspi/Accessibility.h>
 #include "accessible.h"
 #include "application.h"
 
+#define APP_STATIC_BUFF_SZ 30
+
 int
 main(int argc, char **argv)
 {
@@ -35,7 +38,7 @@ main(int argc, char **argv)
         CORBA_Object oclient;
         AtkObject *atko;
         char *obj_id;
-        char sbuf[30];
+        char sbuf[APP_STATIC_BUFF_SZ];
 
         Accessibility_Registry registry;
         Accessibility_Event e;
@@ -51,9 +54,12 @@ main(int argc, char **argv)
 
         /* Create the accesssible application server object */
         /* TODO: get app name and pid */
-        sprintf(sbuf, "application-%s", argv[1]);
+       if (argc > 1)
+               snprintf(sbuf, APP_STATIC_BUFF_SZ, "application-%s",
+                                       (argc > 1) ? argv[1] : "test");
+
         atko = g_object_new (atk_object_get_type(), NULL);
-        atk_object_set_name (atko, "sbuf");
+        atk_object_set_name (atko, sbuf);
         atk_object_set_description( atko, "test application for accessibility SPI");
         app = application_new(atko);