Merge branch 'master' into dtdocbook

cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c

@@ -1771,7 +1771,7 @@ populate_obj_menu(
      * Set the label of the menu items to be the names of the ABObj's
      */
     for (i = 0, trav_open(&trav, parent, AB_TRAV_SALIENT_CHILDREN); 
-	i < num_items_needed, (cur_obj = trav_next(&trav)) != NULL; )
+	i < num_items_needed && (cur_obj = trav_next(&trav)) != NULL; )
     {
 	char	*label;
 

cde/programs/dtcm/server/reclotick.c

@@ -141,7 +141,7 @@ ClosestTick(
 	 * to see if the duration needs to be updated.
 	 */
 	if (re->re_duration == RE_NOTSET)
-		(*res)->res_duration == RE_NOTSET;
+		(*res)->res_duration = RE_NOTSET;
 
 	return closest_tick;
 }

cde/programs/dtmail/dtmailpr/Makefile.am

@@ -7,28 +7,4 @@ dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
 
 dtmailpr_LDADD = ../libDtMail/libDtMail.a $(DTCLIENTLIBS) $(XTOOLLIB) $(LTLIBICONV)
 
-# FIXME - solaris
-#if SOLARIS
-# if SUNPRODIR
-# SUNPRO_DIR = /opt/SUNWspro
-# else
-# SUNPRO_DIR = SUNPRODIR
-#endif
-#if I386
-# JET -- i386 is NOT big endian...
-#dtmailpr_CXXFLAGS += -DBIG_ENDIAN
-#endif
-#if USE_SPRO_V3
-#dtmailpr_CXXFLAGS += -noex -USPRO_V2
-#if DEBUGTREE
-#dtmailpr_CXXFLAGS += -xsb
-#endif
-#endif
-#
-#dtmailpr_CXXFLAGS += -L$(SUNPRO_DIR)/lib -xstrconst -Xc -v -DMMAP_NORESERVE \
-#                    -DSPRO_V2 +p +w
-#dtmailpr_LDADD += -Bstatic -lC -Bdynamic -lc -Bstatic -ldl -lgen -lm -lw \
-#		  -lintl -lnsl
-#endif
-
 dtmailpr_SOURCES = main.C message.C mailbox.C utils.C

cde/programs/dtprintinfo/libUI/MotifUI/Dialog.C

@@ -338,7 +338,11 @@ Dialog::Dialog(MotifUI *parent, char *title, char *base_directory,
    StringFree(pattern_string);
    if (help)
     {
-      _help_callback_data = _help_callback_data;
+      // JET - this does nothing - should probably be assigned from
+      // help_callback_data, but that argument seems to have been
+      // removed from the arg list (commented out for some reason).
+      // So, I'll just comment this out for now:
+      // _help_callback_data = _help_callback_data;
       XtAddCallback(_w, XmNhelpCallback, &Dialog::DialogCB, (XtPointer) this);
     }
    else