From 67d9d66eb7ac15f59bdd9a2d4b4bb9f081f67ef7 Mon Sep 17 00:00:00 2001
From: billh <billh@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Fri, 30 Jan 2004 17:47:16 +0000
Subject: [PATCH] Portability fixes (bug 131640), revised patch from
 TheWrittenWord.com

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@594 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---
 atk-bridge/bridge.c               | 2 +-
 configure.in                      | 9 +++------
 registryd/deviceeventcontroller.c | 2 +-
 registryd/registry.c              | 2 +-
 test/screen-review-test.c         | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index edfd340..6066cdc 100644
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -40,7 +40,7 @@
 
 #define DBG(a,b) if(_dbg>=(a))b
 
-static int _dbg = 0;
+int _dbg = 0;
 static CORBA_Environment ev;
 static Accessibility_Registry registry = CORBA_OBJECT_NIL;
 static Accessibility_DeviceEventController device_event_controller = CORBA_OBJECT_NIL;
diff --git a/configure.in b/configure.in
index f422efc..81ee0bc 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,6 @@ PKG_CHECK_MODULES(REGISTRYD, \
 	libbonobo-2.0 >= 1.107.0 \
 	gtk+-2.0 > 2.0.0 \
 	atk >= 1.3.4)
-REGISTRYD_LIBS="$REGISTRYD_LIBS" 
 AC_SUBST(REGISTRYD_LIBS)
 AC_SUBST(REGISTRYD_CFLAGS)
 
@@ -134,7 +133,6 @@ AC_SUBST(TESTS_CFLAGS)
 PKG_CHECK_MODULES(ATK_BRIDGE, \
 	libbonobo-2.0 >= 1.107.0 \
 	atk >= 1.3.4)
-ATK_BRIDGE_LIBS="$ATK_BRIDGE_LIBS" 
 AC_SUBST(ATK_BRIDGE_LIBS)
 AC_SUBST(ATK_BRIDGE_CFLAGS)
 
@@ -156,10 +154,9 @@ AC_SUBST(LIBBONOBO_IDL_DIR)
 
 CFLAGS="$CFLAGS $X_LIBS"
 dnl path to Xtst
-AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst)
-if test "x$XTST_LIBS" = x; then
-  AC_MSG_ERROR(Couldn't find the Xtst library. Check config.log for details)
-fi
+AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
+	AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
+	-lX11 -lXext)
 AC_SUBST(XTST_LIBS)
 
 have_xkb=
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 5c41371..9f1255b 100644
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -1376,7 +1376,7 @@ spi_keystroke_from_x_key_event (XKeyEvent *x_key_event)
   Accessibility_DeviceEvent key_event;
   KeySym keysym;
   const int cbuf_bytes = 20;
-  char cbuf [cbuf_bytes+1];
+  char cbuf [21];
   int nbytes;
 
   nbytes = XLookupString (x_key_event, cbuf, cbuf_bytes, &keysym, NULL);  
diff --git a/registryd/registry.c b/registryd/registry.c
index 31dbb81..2d2ae74 100644
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -318,7 +318,7 @@ parse_event_type (EventTypeStruct *etype, const char *event_name)
       else
         {
 	  etype->minor = etype->major;
-	  etype->detail = g_quark_from_static_string (""); //etype->major;
+	  etype->detail = g_quark_from_static_string (""); /*etype->major;*/
         }
     }
   else
diff --git a/test/screen-review-test.c b/test/screen-review-test.c
index 2d63aa2..abc916d 100644
--- a/test/screen-review-test.c
+++ b/test/screen-review-test.c
@@ -331,10 +331,10 @@ text_chunk_list_head_clip (GList *text_chunk_list,
 {
 	GList *target, *iter = next, *prev;
 	prev = iter->prev;
-//	if (chunk->string && strlen (chunk->string)) { 
+/*	if (chunk->string && strlen (chunk->string)) { */
 		text_chunk_list =
 			g_list_insert_before (text_chunk_list, next, chunk);
-//	}
+/*	}*/
 	while (iter && CHUNK_BOUNDS_SPANS_END (chunk, (TextChunk *)iter->data)) {
 #ifdef CLIP_DEBUG			
 			fprintf (stderr, "deleting %s\n",
-- 
2.7.4