dtinfo subtree clients

diff --git a/cde/programs/dtinfo/clients/Imakefile b/cde/programs/dtinfo/clients/Imakefile
index 53803977a89ee4610a54a824327732bd6b093a68..858ed710fc897e89c0427a24620b09022f474f79 100644 (file)
--- 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 f3ea3a0f9146f446e4a657743b6c1c71ccb10c17..1adde51ede0265aabab7abacc0677d3b58537ba2 100644 (file)
--- 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 fda1762ae17c5d16cb6fe3bfb2e0d9dc8991ca60..6d96f18af6120f6407bdae5afd48e1d56338e426 100644 (file)
--- 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 8bf8db64276dea75f54c14d7b998e7ff0bf3a85f..26ffc35e36568fa4daa18f90d9224c311f115e31 100644 (file)
--- 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\