1999-09-19 Andrew V. Samoilov <sav@bcs.zp.ua>

* src/user.c (check_patterns): char* is used instead of char [] in sizeof

* src/util.c (string_perm): prefix named pipes by 'p' and not by `s'


1999-09-19  David Martin <dmartina@usa.net>

* gtkedit/editcmd.c (edit_print_string): Use unsigned char so that
8 bit chars from strftime get displayed when inserting date.

* lib/mc.ext.in: Add entries for bzip2 compressed pages as used in
Mandrake 6.0. The generic entry for bzip2 moved to the end of the
file to avoid interferences. In this one I changed the extension check
to a type check (as used for gzip) which might give problems in some
systems.

* configure.in: Use -Tlatin1 to format man pages when available and
"view" 8 bit chars.


1999-09-19  Norbert Warmuth  <nwarmuth@privat.circular.de>

* gtkedit/edit.h: Include files reordered in order to make it compile with
--with-debug

* gtkedit/editcmd.c (menu_save_mode_cmd): calculate dialog width
dependent on lenght of translated strings to display.

* src/mad.c, mad.h, util.c, util.h: Move mad-functions from util.[ch]
to mad.[ch]

* src/option.c: Include files reordered in order to make it compile with
--with-debug

* src/mad.c (mad_init): New function. Initialize debug FILE pointer to
stderr (moved to a function because not on every system stderr is
a constant).
(mad_set_debug): added const qualifier

* src/main.c (main): call mad_init

* po/*.po: s/defination/definition/

* gnome/Makefile.in ($(MAGICDEV_GENERATED)): Make it compile with $buildir
!= $srcdir.

* vfs/ftpfs.c (ftpfs_set_debug), vfs.h: added const qualifier.

* vfs/mcserv.c: removed definition of mad_strconcat which is also
in mad.c.

ChangeLog

@@ -1,3 +1,25 @@
+1999-09-19  David Martin <dmartina@usa.net>
+
+	* gtkedit/editcmd.c (edit_print_string): Use unsigned char so that 
+	8 bit chars from strftime get displayed when inserting date.
+
+	* lib/mc.ext.in: Add entries for bzip2 compressed pages as used in 
+	Mandrake 6.0. The generic entry for bzip2 moved to the end of the 
+	file to avoid interferences. In this one I changed the extension check 
+	to a type check (as used for gzip) which might give problems in some 
+	systems.
+
+	* configure.in: Use -Tlatin1 to format man pages when available and 
+	"view" 8 bit chars.
+
+1999-09-19  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* gtkedit/edit.h: Include file reordering to make it compile with
+	--with-debug
+
+	* gtkedit/editcmd.c (menu_save_mode_cmd): calculate dialog width
+	dependent on lenght of translated strings to display.
+
 1999-09-16  Owen Taylor  <otaylor@redhat.com>
 
 	* Remove the magicdev autoconf test in favor of just

configure.in

@@ -582,19 +582,26 @@ fi
 AC_SUBST(MANDOC)
 
 dnl
-dnl Check if nroff accepts -Tascii
+dnl Check if nroff accepts -Tlatin1 or -Tascii
 dnl
 if $HAVE_nroff; then
-    AC_MSG_CHECKING(If nroff accepts -Tascii)
+    AC_MSG_CHECKING(if nroff accepts -Tlatin1 or -Tascii)
     AC_CACHE_VAL(ac_cv_nroff_tascii, [
-    nroff -Tascii < /dev/null > /dev/null 2>&1 /dev/null
+    nroff -Tlatin1 < /dev/null > /dev/null 2>&1 /dev/null
     if test $? = 0
     then
-	ac_cv_nroff_tascii=" -Tascii"
+	ac_cv_nroff_tascii=" -Tlatin1"
         AC_MSG_RESULT(yes)
     else
-	ac_cv_nroff_tascii=""
-        AC_MSG_RESULT(no)
+        nroff -Tascii < /dev/null > /dev/null 2>&1 /dev/null
+        if test $? = 0
+        then
+	    ac_cv_nroff_tascii=" -Tascii"
+            AC_MSG_RESULT(yes)
+        else
+    	    ac_cv_nroff_tascii=""
+    	    AC_MSG_RESULT(no)
+	fi
     fi
     ])
 fi

gnome/Makefile.in

@@ -211,7 +211,7 @@ CLIENTOBJS = 			\
 $(CORBA_GENERATED): $(rootdir)/idl/FileManager.idl
 	orbit-idl `gnome-config --cflags idl` $(rootdir)/idl/FileManager.idl
 
-$(MAGICDEV_GENERATED): magicdev.idl
+$(MAGICDEV_GENERATED): $(srcdir)/magicdev.idl
 	orbit-idl `gnome-config --cflags idl` --noskels $(srcdir)/magicdev.idl
 
 FileManager-impl.c: FileManager.h

gtkedit/edit.h

@@ -115,6 +115,7 @@
 
 #else
 
+#    include "src/global.h"
 #    include "src/main.h"		/* for char *shell */
 #    include "src/mad.h"
 #    include "src/dlg.h"
@@ -122,7 +123,6 @@
 #    include "src/color.h"
 #    include "src/dialog.h"
 #    include "src/mouse.h"
-#    include "src/global.h"
 #    include "src/help.h"
 #    include "src/key.h"
 #    include "src/wtools.h"		/* for QuickWidgets */

gtkedit/editcmd.c

@@ -326,7 +326,6 @@ int edit_save_file (WEdit * edit, const char *filename)
  */
 void menu_save_mode_cmd (void)
 {
-#define DLG_X 38
 #define DLG_Y 10
     static char *str_result;
     static int save_mode_new;
@@ -337,29 +336,52 @@ void menu_save_mode_cmd (void)
 	N_("Do backups -->")};
     static QuickWidget widgets[] =
     {
-	{quick_button, 18, DLG_X, 7, DLG_Y, N_("&Cancel"), 0,
+	{quick_button, 18, 0, 7, DLG_Y, N_("&Cancel"), 0,
 	 B_CANCEL, 0, 0, XV_WLAY_DONTCARE, "c"},
-	{quick_button, 6, DLG_X, 7, DLG_Y, N_("&Ok"), 0,
+	{quick_button, 6, 0, 7, DLG_Y, N_("&Ok"), 0,
 	 B_ENTER, 0, 0, XV_WLAY_DONTCARE, "o"},
-	{quick_input, 23, DLG_X, 5, DLG_Y, 0, 9,
+	{quick_input, 23, 0, 5, DLG_Y, 0, 9,
 	 0, 0, &str_result, XV_WLAY_DONTCARE, "i"},
-	{quick_label, 22, DLG_X, 4, DLG_Y, N_("Extension:"), 0,
+	{quick_label, 23, 0, 4, DLG_Y, N_("Extension:"), 0,
 	 0, 0, 0, XV_WLAY_DONTCARE, "savemext"},
-	{quick_radio, 4, DLG_X, 3, DLG_Y, "", 3,
+	{quick_radio, 4, 0, 3, DLG_Y, "", 3,
 	 0, &save_mode_new, str, XV_WLAY_DONTCARE, "t"},
 	{0}};
     static QuickDialog dialog =
 /* NLS ? */
-    {DLG_X, DLG_Y, -1, -1, N_(" Edit Save Mode "), "[Edit Save Mode]",
+    {0, DLG_Y, -1, -1, N_(" Edit Save Mode "), "[Edit Save Mode]",
      "esm", widgets};
     static int i18n_flag = 0;
 
     if (!i18n_flag) {
         int i;
+	int maxlen = 0;
+	int dlg_x;
+	int l1;
+
+	/* Ok/Cancel buttons */
+	l1 = strlen (_(widgets[0].text)) + strlen (_(widgets[1].text)) + 5;
+	maxlen = max (maxlen, l1);
         
-        for (i = 0; i < 3; i++ )
+        for (i = 0; i < 3; i++ ) {
             str[i] = _(str[i]);
+	    maxlen = max (maxlen, strlen (str[i]) + 7);
+	}
         i18n_flag = 1;
+
+        dlg_x = maxlen + strlen (_(widgets[3].text)) + 5 + 1;
+        widgets[2].hotkey_pos = strlen (_(widgets[3].text)); /* input field length */
+        dlg_x = min (COLS, dlg_x);
+	dialog.xlen = dlg_x;
+
+        i = (dlg_x - l1)/3;
+	widgets[1].relative_x = i;
+	widgets[0].relative_x = i + strlen (_(widgets[1].text)) + i + 4;
+
+	widgets[2].relative_x = widgets[3].relative_x = maxlen + 2;
+
+	for (i = 0; i < sizeof (widgets)/sizeof (widgets[0]); i++)
+		widgets[i].x_divisions = dlg_x;
     }
 
     widgets[2].text = option_backup_ext;
@@ -2828,7 +2850,7 @@ int edit_print_string (WEdit * e, const char *s)
 {
     int i = 0;
     while (s[i])
-	edit_execute_cmd (e, -1, s[i++]);
+	edit_execute_cmd (e, -1, (unsigned char) s[i++]);
     e->force |= REDRAW_COMPLETELY;
     edit_update_screen (e);
     return i;

lib/mc.ext.in

@@ -127,21 +127,6 @@ shell/.tar
 	Extract=tar xf %f
 	Icon=tar.xpm
 
-# bzipped
-regex/\.bz$
-	Open=bzip -dc %f | %var{PAGER:more}
-	View=%view{ascii} bzip -dc %f 2>/dev/null
-	Edit=I=`date +%%s`; export I; bzip -cd %f >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip -c /tmp/bzed.$I > %f; rm -f /tmp/bzed.$I
-	Uncompress=bunzip %f
-	Icon=compressed.xpm
-
-regex/\.bz2$
-	Open=bzip2 -dc %f | %var{PAGER:more}
-	View=%view{ascii} bzip2 -dc %f 2>/dev/null
-	Edit=I=`date +%%s`; export I; bzip2 -cd %f >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip2 -c /tmp/bzed.$I > %f; rm -f /tmp/bzed.$I
-	Uncompress=bunzip2 %f
-	Icon=compressed.xpm
-
 # Programs
 shell/rm
 	Open=if test ! -d ~/.trash; then mkdir ~/.trash; fi; I=%{Enter file to be safely deleted}; if test -n "$I"; then mv -f -b -V numbered %q ~/.trash; fi
@@ -369,8 +354,18 @@ shell/.ms
 
 # Manual page - compressed
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.g?[Zz]$
-	Open=gunzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} gunzip -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=gzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} gzip -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Icon=man.xpm
+
+regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz$
+	Open=bzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} bzip -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Icon=man.xpm
+
+regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz2$
+	Open=bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@
 	Icon=man.xpm
 
 regex/(read\.?me$)|(README)
@@ -465,20 +460,6 @@ type/mail
 	Icon=mail.xpm
 	View=%view{ascii} mcmfmt < %f
 
-# gzipped
-type/gzip
-	Open=gzip -dc %f | %var{PAGER:more}
-	View=%view{ascii} gzip -dc %f 2>/dev/null
-	Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I
-	Uncompress=gunzip %f
-	Icon=compressed.xpm
-
-type/compress
-	Open=gzip -dc %f | %var{PAGER:more}
-	View=%view{ascii} gzip -dc %f 2>/dev/null
-	Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I
-	Icon=compressed.xpm
-
 # Makefile
 regex/[Mm]akefile
 	Open=make -f %f %{Enter parameters}
@@ -582,6 +563,35 @@ regex/\.trpm$
 	Open=%cd trpm:%p
 	View=%view{ascii} rpm -qivl --scripts `basename %p .trpm`
 
+# gzipped
+type/gzip
+	Open=gzip -dc %f | %var{PAGER:more}
+	View=%view{ascii} gzip -dc %f 2>/dev/null
+	Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I
+	Uncompress=gunzip %f
+	Icon=compressed.xpm
+
+# bzipped
+type/bzip2
+	Open=bzip2 -dc %f | %var{PAGER:more}
+	View=%view{ascii} bzip2 -dc %f 2>/dev/null
+	Edit=I=`date +%%s`; export I; bzip2 -cd %f >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip2 -c /tmp/bzed.$I > %f; rm -f /tmp/bzed.$I
+	Uncompress=bunzip2 %f
+	Icon=compressed.xpm
+
+type/bzip
+	Open=bzip -dc %f | %var{PAGER:more}
+	View=%view{ascii} bzip -dc %f 2>/dev/null
+	Edit=I=`date +%%s`; export I; bzip -cd %f >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip -c /tmp/bzed.$I > %f; rm -f /tmp/bzed.$I
+	Uncompress=bunzip %f
+	Icon=compressed.xpm
+
+type/compress
+	Open=gzip -dc %f | %var{PAGER:more}
+	View=%view{ascii} gzip -dc %f 2>/dev/null
+	Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I
+	Icon=compressed.xpm
+
 # Default target for anything not described above
 default/*
 	Open=

po/ChangeLog

@@ -1,3 +1,7 @@
+1999-09-19  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* *.po: s/defination/definition/
+
 1999-09-18  Kjartan Maraas  <kmaraas@online.no>
 
 	* no.po: Updated translation.

po/ca.po

@@ -5652,7 +5652,7 @@ msgstr ""
 
 #: src/user.c:261
 #, c-format
-msgid " Invalid shell pattern defination \"%c\". "
+msgid " Invalid shell pattern definition \"%c\". "
 msgstr " La definició «%c» del patró d'intèrpret no és vàlida. "
 
 #: src/user.c:394

po/cs.po

@@ -5592,7 +5592,7 @@ msgstr ""
 
 #: src/user.c:261
 #, c-format
-msgid " Invalid shell pattern defination \"%c\". "
+msgid " Invalid shell pattern definition \"%c\". "
 msgstr " Chybná definice vzoru shellu \"%c\". "
 
 #: src/user.c:394

po/da.po

@@ -5548,7 +5548,7 @@ msgstr ""
 
 #: src/user.c:261
 #, c-format
-msgid " Invalid shell pattern defination \"%c\". "
+msgid " Invalid shell pattern definition \"%c\". "
 msgstr " Ugyldig mønsterdefinition for skal \"%c\". "
 
 #: src/user.c:394