Merge branch 'master' into autotools-conversion

diff --git a/cde/contrib/desktopentry-setlang/README-cde-alt b/cde/contrib/desktopentry-setlang/README-cde-alt
deleted file mode 100644 (file)
index 9d61334..0000000
--- a/cde/contrib/desktopentry-setlang/README-cde-alt
+++ /dev/null
@@ -1,18 +0,0 @@
-This is another method to setup an xsession which allows you to execute
-commads before the CDE Xsession gets executed. 
-This alternate method is useful when for example you need to 
-set a different language.
-
-In this example we 
-1. have the login manager execute /usr/dt/bin/startxsession.sh script
-2. The /usr/dt/bin/startxsession.sh first sets properly the LANG variable
-       (or you can add whatever you want to execute before CDE Xsession starts)
-       and then executes /usr/dt/bin/Xsession which will start CDE.
-
-To install, after you edit the startxsession.sh to your liking, do as root:
-
-cp /path/to/cdesktopenv-code/cde/contrib/desktopentry/cde-alt.desktop /usr/share/xsessions/
-cp /path/to/cdesktopenv-code/cde/contrib/desktopentry/startxsession.sh /usr/dt/bin/
-chmod ugo+rx /usr/dt/bin/startxsession.sh
-
-

diff --git a/cde/contrib/desktopentry-setlang/cde-alt.desktop b/cde/contrib/desktopentry-setlang/cde-alt.desktop
deleted file mode 100644 (file)
index 41c71b5..0000000
--- a/cde/contrib/desktopentry-setlang/cde-alt.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=CDE
-Comment=Use this session to boot into the Common Desktop Environment
-Keywords=Common Desktop Environment
-Exec=/usr/dt/bin/startxsession.sh
-Icon=Dtlogo.pm
-Type=Application

diff --git a/cde/contrib/desktopentry-setlang/startxsession.sh b/cde/contrib/desktopentry-setlang/startxsession.sh
deleted file mode 100644 (file)
index 34608c4..0000000
--- a/cde/contrib/desktopentry-setlang/startxsession.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export PATH=$PATH:/usr/dt/bin
-export LANG=el_GR.UTF-8
-/usr/dt/bin/Xsession
-

diff --git a/cde/contrib/desktopentry/README b/cde/contrib/desktopentry/README
index 1579b1024cd086b7e92bfa36733e596cc5cd6437..069a08fef4f8549fe7364e8e287bff48d2ca7d88 100644 (file)
--- a/cde/contrib/desktopentry/README
+++ b/cde/contrib/desktopentry/README
@@ -6,4 +6,7 @@ https://standards.freedesktop.org/desktop-entry-spec/latest
 It is the opposite style to contrib/desktop2dt that takes desktop files and
 converts them for use with dtlogin.
 
-It does not yet support language/login in other than English/C locale.
+Language selection is the job of the login manager (xdm, dtlogin, kdm,
+etc).
+
+

diff --git a/cde/programs/dtksh/xmcmds.c b/cde/programs/dtksh/xmcmds.c
index e3f1e8bd58c359432f26c6b5dbd444ef3a5f03fc..ff6b6e81e1d48e4a92c3c985c737d56016a354db 100644 (file)
--- a/cde/programs/dtksh/xmcmds.c
+++ b/cde/programs/dtksh/xmcmds.c
@@ -171,7 +171,7 @@ static int Text_Widget(
                         int argc,
                         char *argv[]) ;
 static int Text_VarAndWidget( 
-                        int (*func)(Widget w),
+                        long (*func)(Widget w),
                         Boolean varIsString,
                         int argc,
                         char *argv[]) ;
@@ -1301,7 +1301,7 @@ do_DtHelpReturnSelectedWidgetId(
        return(1);
    }
 
-   res = DtHelpReturnSelectedWidgetId(w->w, NULL, &retWidget);
+   res = DtHelpReturnSelectedWidgetId(w->w, 0, &retWidget);
    XSync(XtDisplay(w->w), False);
 
    f.addr = (caddr_t)&res;
@@ -3959,7 +3959,7 @@ do_XmTextRemove(
 
 static int
 Text_VarAndWidget(
-        int (*func)(Widget w),
+        long (*func)(Widget w),
         Boolean varIsString,
         int argc,
         char *argv[] )
@@ -4008,7 +4008,7 @@ do_XmTextGetTopCharacter(
         int argc,
         char *argv[] )
 {
-   return (Text_VarAndWidget((int (*)())XmTextGetTopCharacter, False, argc, 
+   return (Text_VarAndWidget((long (*)())XmTextGetTopCharacter, False, argc, 
            argv));
 }
 
@@ -4018,7 +4018,7 @@ do_XmTextGetBaseline(
         int argc,
         char *argv[] )
 {
-   return (Text_VarAndWidget(XmTextGetBaseline, False, argc, argv));
+    return (Text_VarAndWidget((long (*)())XmTextGetBaseline, False, argc, argv));
 }
 
 
@@ -4027,7 +4027,7 @@ do_XmTextGetInsertionPosition(
         int argc,
         char *argv[] )
 {
-   return (Text_VarAndWidget((int (*)())XmTextGetInsertionPosition, False, 
+   return (Text_VarAndWidget((long (*)())XmTextGetInsertionPosition, False, 
            argc, argv));
 }
 
@@ -4037,7 +4037,7 @@ do_XmTextGetLastPosition(
         int argc,
         char *argv[] )
 {
-   return (Text_VarAndWidget((int (*)())XmTextGetLastPosition, False, argc, 
+   return (Text_VarAndWidget((long (*)())XmTextGetLastPosition, False, argc, 
                              argv));
 }
 
@@ -4047,7 +4047,7 @@ do_XmTextGetMaxLength(
         int argc,
         char *argv[] )
 {
-   return (Text_VarAndWidget(XmTextGetMaxLength, False, argc, argv));
+   return (Text_VarAndWidget((long (*)())XmTextGetMaxLength, False, argc, argv));
 }
 
 
@@ -4056,7 +4056,7 @@ do_XmTextGetSelection(
         int argc,
         char *argv[] )
 {
-   return (Text_VarAndWidget((int (*)())XmTextGetSelection, True, argc, argv));
+   return (Text_VarAndWidget((long (*)())XmTextGetSelection, True, argc, argv));
 }
 
 
@@ -4065,7 +4065,7 @@ do_XmTextGetString(
         int argc,
         char *argv[] )
 {
-   return (Text_VarAndWidget((int (*)())XmTextGetString, True, argc, argv));
+   return (Text_VarAndWidget((long (*)())XmTextGetString, True, argc, argv));
 }