sixth dtinfo patch
--
Ulrich Wilkens
Email: m...@uwilkens.de
>From 34a55d04148037da60f15f249db52bd72cf7f120 Mon Sep 17 00:00:00 2001
From: Ulrich Wilkens <m...@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 ++
.../dtinfo/clients/dtinfo_start/dtinfo_start.c | 6 ++--
.../dtinfo/clients/dtinfo_start/dtinfo_start.msg | 38 +++++++++++-----------
4 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/cde/programs/dtinfo/clients/Imakefile
b/cde/programs/dtinfo/clients/Imakefile
index 5380397..858ed71 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 f3ea3a0..1adde51 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 fda1762..f4e9394 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 8bf8db6..94a9188 100644
--- a/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.msg
+++ b/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.msg
@@ -1,5 +1,5 @@
$ $TOG: dtinfo_start.msg /main/2 1999/09/20 13:27:31 mgreess $
-$
+$
$ (c) Copyright 1996 Digital Equipment Corporation.
$ (c) Copyright 1996 Hewlett-Packard Company.
$ (c) Copyright 1996 International Business Machines Corp.
@@ -7,26 +7,26 @@ $ (c) Copyright 1996 Sun Microsystems, Inc.
$ (c) Copyright 1996 Novell, Inc.
$ (c) Copyright 1996 FUJITSU LIMITED.
$ (c) Copyright 1996 Hitachi.
-$
+$
$
******************************************************************************
-$
+$
$set 1
$ The messages in this set will only appear in the users
$ "errorlog" file.
-$
+$
$
******************************************************************************
-$
+$
$ Messages 1-5: These messages result from an error in a tt_* function
$ call.
-$
+$
1 The ttsession(1) process is not running and the ToolTalk\n\
service cannot restart it.
2 The current default process identifier is out of date or invalid.
3 The specified ToolTalk session is out of date or invalid.
-$
+$
$ Message 4: Do not localize the word DtInfo_Start.
-$
+$
4 The process type 'DtInfo_Start' is not the\n\
name of an installed process type.
@@ -34,38 +34,38 @@ name of an installed process type.
6 Cannot invoke an action because malloc(1) failed.
-$
+$
$ Message 7: Do not localize the word DISPLAY. Do not localize the
$ word XtOpenDisplay().
-$
+$
7 XtOpenDisplay() failed. Perhaps the DISPLAY environment\n\
variable is not set or is invalid.
-$
+$
$ Message 8: Do not localize the word DtAppInitialize().
-$
+$
8 DtAppInitialize() failed. Perhaps the desktop environment\n\
is not properly installed.
-$
+$
$ Message 9: Do NOT localize the word DTINFOLIBDEFAULT
-$
+$
9 An InfoLib was not provided in the '%s' message.\n\
The value of the environment variable DTINFOLIBDEFAULT\n\
(%s) will be used for the InfoLib.
-$
+$
$ Message 10: Do NOT localize the word DTINFOLIBDEFAULT
-$
+$
10 An InfoLib was not provided in the '%s' message\n\
and the environment variable DTINFOLIBDEFAULT was not defined.
-$
+$
$ 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\
--
1.7.11.5
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
