From f17d779daba0e07c033239299ead9ef66e387ffc Mon Sep 17 00:00:00 2001
From: Ulrich Wilkens <mail@uwilkens.de>
Date: Sun, 14 Oct 2012 18:04:35 +0200
Subject: [PATCH] dtinfo subtree clients

---
 cde/programs/dtinfo/clients/Imakefile                     | 7 +++++++
 cde/programs/dtinfo/clients/dtinfo_start/Imakefile        | 2 ++
 cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.c   | 6 +++---
 cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.msg | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/cde/programs/dtinfo/clients/Imakefile b/cde/programs/dtinfo/clients/Imakefile
index 53803977..858ed710 100644
--- a/cde/programs/dtinfo/clients/Imakefile
+++ b/cde/programs/dtinfo/clients/Imakefile
@@ -5,6 +5,13 @@ XCOMM $TOG: Imakefile /main/5 1998/08/10 15:51:11 mgreess $
 
 SUBDIRS = dtinfo_start
 
+XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
+#undef  TopLevelProject
+#define TopLevelProject		DtInfo
+IMAKE_DEFINES = -DTopLevelProject=TopLevelProject \
+		-DProjectTmplFile='<DtInfo.tmpl>' \
+		-DProjectRulesFile='<DtInfo.rules>'
+
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 
diff --git a/cde/programs/dtinfo/clients/dtinfo_start/Imakefile b/cde/programs/dtinfo/clients/dtinfo_start/Imakefile
index f3ea3a0f..1adde51e 100644
--- a/cde/programs/dtinfo/clients/dtinfo_start/Imakefile
+++ b/cde/programs/dtinfo/clients/dtinfo_start/Imakefile
@@ -9,6 +9,8 @@ XCOMM $XConsortium: Imakefile /main/5 1996/06/11 17:45:12 cde-hal $
  * (c) Copyright 1996 Hitachi.
  */
 
+NormalCplusplusObjectRule()
+
 INCLUDES =  -I.
 
 #ifdef AIXArchitecture
diff --git a/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.c b/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.c
index fda1762a..6d96f18a 100644
--- a/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.c
+++ b/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.c
@@ -116,7 +116,7 @@ static void DieFromToolTalkError (
 	Tt_status		status);
 
 
-void
+int
 main ( 
 	int 			argc,
 	char 			** argv) 
@@ -135,7 +135,7 @@ main (
 	app_context = XtCreateApplicationContext ();
 
 	if (!(display = XtOpenDisplay (app_context, NULL, NULL, name,
-                             	       NULL, NULL, &argc, argv))) {
+				       NULL, 0, &argc, argv))) {
 		DtMsgLogMessage (argv[0], DtMsgLogError, 
 			(char *) GETMESSAGE (SET_NUM, 7, "XtOpenDisplay() failed.  Perhaps the DISPLAY environment\nvariable is not set or is invalid."));
 		exit (1);
@@ -568,7 +568,7 @@ LogToolTalkError (
 static void
 ExitCB (Widget dialog, XtPointer client_data, XtPointer call_data)
 {
-    exit((int) client_data);
+    exit((size_t) client_data);
 }
 
 static void
diff --git a/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.msg b/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.msg
index 8bf8db64..26ffc35e 100644
--- a/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.msg
+++ b/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.msg
@@ -65,7 +65,7 @@ $ Messages 11-16: These message are the result of the dtinfo_start
 $   getting an error while trying to parse a ToolTalk message.
 $
 $   Do NOT localize the word NULL
-$   
+$
 11 The message operation '%d' is not supported.
 
 12 Message '%s' does not have the required\n\
-- 
2.25.1