remove OSF1 support

[oweals/cde.git] / cde / programs / dtpad / main.c

diff --git a/cde/programs/dtpad/main.c b/cde/programs/dtpad/main.c
index 402e688e531c7016ab19e09bc567a0aedf6446aa..ca0619a1540f8ca820a77ebbd407b4d0f2f2b5c7 100644 (file)
--- a/cde/programs/dtpad/main.c
+++ b/cde/programs/dtpad/main.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -44,7 +44,7 @@
 **  This file contains the routines that control the client/server architecture
 **  of dtpad and creation of the top level widgets.
 **
-**  See the comments preceeding main() for a description of the        client/server
+**  See the comments preceding main() for a description of the client/server
 **  architecture of dtpad as well as an overview of the routine hierarchy of
 **  dtpad.  The widget hierarchy of dtpad goes something like this:
 **
@@ -439,11 +439,6 @@ main(
       
     } else {
 
-#ifdef __osf__
-/* Temporary work around for action database problem(platinum BL5 03/29/95). */
-      StartDbUpdate((XtPointer) NULL);
-#endif
-
        /*--------------------------------------------------------
         * Requestor Mode
         *
@@ -633,6 +628,11 @@ CreateFirstPad(
        initialServerResources = pPad->xrdb;
        initialServerResources.server = False; /* so window will be mapped */ 
        initialServerGeometry = pPad->geometry;
+       if(pPad->xrdb.workspaceList)
+               pPad->xrdb.workspaceList = strdup(pPad->xrdb.workspaceList);
+       if(pPad->xrdb.session)
+               pPad->xrdb.session = strdup(pPad->xrdb.session);
+       pPad->geometry = strdup(pPad->geometry);
     }
 
     /* Set some initial Editor instance values */
@@ -1677,7 +1677,6 @@ RestoreInitialServerResources(
        XtFree(pPad->geometry );
 
     pPad->xrdb = initialServerResources;
-    pPad->geometry = initialServerGeometry;
 
     /* -----> duplicate resource strings */
     if (initialServerResources.workspaceList != (char *)NULL)
@@ -1818,7 +1817,7 @@ Usage(
 
    template = (GETMESSAGE(7,10, message_string2));
 
-   fprintf (stderr, template);
+   fprintf (stderr, "%s", template);
 
    exit (0);
 }
@@ -1844,7 +1843,7 @@ dtpadXErrorHandler(
     _DtSimpleError("dtpad", DtWarning, NULL, msg, NULL);
 
     /*
-     * if the error occured on the print display we're going to set
+     * if the error occurred on the print display we're going to set
      * a variable so that and when the job is done, right before calling
      * XpEndJob, we call XpCancelJob, and notify the user.
      */