From c75f90ead1132640b2848babda6625c800528a8c Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 29 Jan 2004 08:08:05 +0000
Subject: Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST
 2004

---
 src/Actions.c  | 4 ++--
 src/Text.c     | 8 +++++---
 src/TextSink.c | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Actions.c b/src/Actions.c
index f675fb4..91d411b 100644
--- a/src/Actions.c
+++ b/src/Actions.c
@@ -25,7 +25,7 @@
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Actions.c,v 3.17 2003/03/25 04:18:10 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Actions.c,v 3.18 2004/01/23 03:57:58 dawes Exp $ */
 
 #include <ctype.h>
 #include <stdio.h>
@@ -651,7 +651,7 @@ XawPrintActionErrorMsg(String action_name, Widget w,
   unsigned int size, idx;
 
   size = XmuSnprintf(msg, sizeof(msg), "%s(): bad number of parameters.\n\t(",
-		     action_name, action_name);
+		     action_name);
 
   idx = 0;
   while (idx < *num_params - 1 && size < sizeof(msg))
diff --git a/src/Text.c b/src/Text.c
index 000f9d8..d5f85f8 100644
--- a/src/Text.c
+++ b/src/Text.c
@@ -74,7 +74,7 @@ SOFTWARE.
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Text.c,v 3.53 2003/10/02 13:29:38 eich Exp $ */
+/* $XFree86: xc/lib/Xaw/Text.c,v 3.54 2003/12/22 17:48:04 tsi Exp $ */
 
 #include <stdio.h>
 #include <X11/IntrinsicP.h>
@@ -171,7 +171,9 @@ static Boolean CvtJustifyModeToString(Display*, XrmValue*, Cardinal*,
 				      XrmValue*, XrmValue*, XtPointer*);
 static void DestroyHScrollBar(TextWidget);
 static void DestroyVScrollBar(TextWidget);
+#ifndef OLDXAW
 static void DisplayText(Widget, XawTextPosition, XawTextPosition);
+#endif
 static void OldDisplayText(Widget, XawTextPosition, XawTextPosition);
 static void DisplayTextWindow(Widget);
 static void DoCopyArea(TextWidget, int, int, unsigned int, unsigned int,
@@ -2743,11 +2745,11 @@ OldDisplayText(Widget w, XawTextPosition left, XawTextPosition right)
     }
 }
 
+#ifndef OLDXAW
 /*ARGSUSED*/
 static void
 DisplayText(Widget w, XawTextPosition left, XawTextPosition right)
 {
-#ifndef OLDXAW
     static XmuSegment segment;
     static XmuScanline next;
     static XmuScanline scanline = {0, &segment, &next};
@@ -2817,8 +2819,8 @@ DisplayText(Widget w, XawTextPosition left, XawTextPosition right)
 	    XmuAreaOr(paint_list->clip, &area);
 	}
     }
-#endif
 }
+#endif
 
 /*
  * This routine implements multi-click selection in a hardwired manner.
diff --git a/src/TextSink.c b/src/TextSink.c
index 45a584a..4ea0dab 100644
--- a/src/TextSink.c
+++ b/src/TextSink.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.21 2002/06/03 21:39:24 paulo Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.22 2004/01/23 03:57:58 dawes Exp $ */
 
 /*
  * Author:  Chris Peterson, MIT X Consortium.
@@ -1330,7 +1330,7 @@ _XawTextSinkAddProperty(XawTextPropertyList *list, XawTextProperty *property,
     else
 	xlfd = null;
 
-    XmuSnprintf(identifier, sizeof(identifier), "%08x%08x%s%s%d%d%d%d%s",
+    XmuSnprintf(identifier, sizeof(identifier), "%08lx%08lx%s%s%d%d%d%d%s",
 		property->mask, property->xlfd_mask,
 		foreground, background,
 		(result->mask & XAW_TPROP_UNDERLINE) != 0,
-- 
cgit v1.2.1