diff -ruN old/mc-4.5.13/Make.common.in new/mc-4.5.14/Make.common.in --- old/mc-4.5.13/Make.common.in Wed Feb 10 19:41:11 1999 +++ new/mc-4.5.14/Make.common.in Thu Feb 11 21:44:21 1999 @@ -27,6 +27,7 @@ extfsdir = $(libdir)/extfs datadir = @datadir@ icondir = $(datadir)/pixmaps/mc +gnomeicondir = @gnomeicondir@ localedir = $(datadir)/locale mandir = @mandir@ man1dir = $(mandir)/man1 diff -ruN old/mc-4.5.13/Specfile new/mc-4.5.14/Specfile --- old/mc-4.5.13/Specfile Wed Feb 10 19:41:11 1999 +++ new/mc-4.5.14/Specfile Thu Feb 11 21:44:21 1999 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.13 +%define ver 4.5.14 %define prefix /usr Summary: Midnight Commander visual shell diff -ruN old/mc-4.5.13/VERSION new/mc-4.5.14/VERSION --- old/mc-4.5.13/VERSION Wed Feb 10 19:41:11 1999 +++ new/mc-4.5.14/VERSION Thu Feb 11 21:44:21 1999 @@ -1 +1 @@ -#define VERSION "4.5.13" +#define VERSION "4.5.14" diff -ruN old/mc-4.5.13/configure new/mc-4.5.14/configure --- old/mc-4.5.13/configure Wed Feb 10 19:41:11 1999 +++ new/mc-4.5.14/configure Thu Feb 11 21:44:21 1999 @@ -586,7 +586,7 @@ PACKAGE=mc -VERSION=4.5.13 +VERSION=4.5.14 cat >> confdefs.h <&6 -echo "configure:9189: checking for $ac_word" >&5 +echo "configure:9191: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9222,7 +9224,7 @@ no_gnome_config="yes" else echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 -echo "configure:9226: checking if $GNOME_CONFIG works" >&5 +echo "configure:9228: checking if $GNOME_CONFIG works" >&5 if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 @@ -9230,7 +9232,7 @@ # Extract the first word of "orbit-config", so it can be a program name with args. set dummy orbit-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9234: checking for $ac_word" >&5 +echo "configure:9236: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9266,7 +9268,7 @@ # Extract the first word of "orbit-idl", so it can be a program name with args. set dummy orbit-idl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9270: checking for $ac_word" >&5 +echo "configure:9272: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_IDL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9300,7 +9302,7 @@ fi echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6 -echo "configure:9304: checking for working ORBit environment" >&5 +echo "configure:9306: checking for working ORBit environment" >&5 if eval "test \"`echo '$''{'gnome_cv_orbit_found'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9336,7 +9338,7 @@ fi echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6 -echo "configure:9340: checking for gnorba libraries" >&5 +echo "configure:9342: checking for gnorba libraries" >&5 if eval "test \"`echo '$''{'gnome_cv_gnorba_found'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9391,6 +9393,7 @@ else xvers="Gnome+$xvers" fi + gnomeicondir=`gnome-config --prefix`/share/pixmaps else echo "$ac_t""no" 1>&6 @@ -9410,7 +9413,7 @@ if test "$no_gnome_config" = "yes"; then echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 -echo "configure:9414: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo "configure:9417: checking for gnomeConf.sh file in $gnome_prefix" >&5 if test -f $gnome_prefix/gnomeConf.sh; then echo "$ac_t""found" 1>&6 echo "loading gnome configuration from" \ @@ -9426,6 +9429,7 @@ else xvers="Gnome+$xvers" fi + gnomeicondir=`gnome-config --prefix`/share/pixmaps else echo "$ac_t""not found" 1>&6 @@ -9441,10 +9445,11 @@ + # Extract the first word of "nroff", so it can be a program name with args. set dummy nroff; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9448: checking for $ac_word" >&5 +echo "configure:9453: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_nroff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9473,7 +9478,7 @@ if $HAVE_nroff; then echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6 -echo "configure:9477: checking for manual formatting macros" >&5 +echo "configure:9482: checking for manual formatting macros" >&5 if eval "test \"`echo '$''{'ac_cv_mandoc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9497,7 +9502,7 @@ if $HAVE_nroff; then echo $ac_n "checking If nroff accepts -Tascii""... $ac_c" 1>&6 -echo "configure:9501: checking If nroff accepts -Tascii" >&5 +echo "configure:9506: checking If nroff accepts -Tascii" >&5 if eval "test \"`echo '$''{'ac_cv_nroff_tascii'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9521,7 +9526,7 @@ # Extract the first word of "file", so it can be a program name with args. set dummy file; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9525: checking for $ac_word" >&5 +echo "configure:9530: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_FILECMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9550,7 +9555,7 @@ if $HAVE_FILECMD; then echo $ac_n "checking for - option to file command""... $ac_c" 1>&6 -echo "configure:9554: checking for - option to file command" >&5 +echo "configure:9559: checking for - option to file command" >&5 if eval "test \"`echo '$''{'ac_cv_filestdin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9593,7 +9598,7 @@ echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6 -echo "configure:9597: checking for -L option to file command" >&5 +echo "configure:9602: checking for -L option to file command" >&5 if eval "test \"`echo '$''{'ac_cv_filel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9619,7 +9624,7 @@ fi echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6 -echo "configure:9623: checking for - option to grep command" >&5 +echo "configure:9628: checking for - option to grep command" >&5 if eval "test \"`echo '$''{'ac_cv_grep_stdin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9659,7 +9664,7 @@ echo $ac_n "checking for subshell support""... $ac_c" 1>&6 -echo "configure:9663: checking for subshell support" >&5 +echo "configure:9668: checking for subshell support" >&5 # Check whether --with-subshell or --without-subshell was given. if test "${with_subshell+set}" = set; then withval="$with_subshell" @@ -9801,7 +9806,7 @@ slang_term="" slang_use_system_installed_lib=false echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:9805: checking for SLang_init_tty in -lslang" >&5 +echo "configure:9810: checking for SLang_init_tty in -lslang" >&5 ac_lib_var=`echo slang'_'SLang_init_tty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9809,7 +9814,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9839,17 +9844,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9843: checking for $ac_hdr" >&5 +echo "configure:9848: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9884,17 +9889,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9888: checking for $ac_hdr" >&5 +echo "configure:9893: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9964,7 +9969,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:9968: checking for tgoto in -ltermcap" >&5 +echo "configure:9973: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9972,7 +9977,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10054,7 +10059,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF #define SLANG_TERMINFO 1 @@ -10087,7 +10092,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10091: checking for tgoto in -ltermcap" >&5 +echo "configure:10096: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10095,7 +10100,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10168,7 +10173,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10172: checking for tgoto in -ltermcap" >&5 +echo "configure:10177: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10176,7 +10181,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10362,17 +10367,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10366: checking for $ac_hdr" >&5 +echo "configure:10371: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10425,7 +10430,7 @@ fi else echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6 -echo "configure:10429: checking for ext2fs_close in -lext2fs" >&5 +echo "configure:10434: checking for ext2fs_close in -lext2fs" >&5 ac_lib_var=`echo ext2fs'_'ext2fs_close | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10433,7 +10438,7 @@ ac_save_LIBS="$LIBS" LIBS="-lext2fs -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10465,17 +10470,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10469: checking for $ac_hdr" >&5 +echo "configure:10474: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10540,7 +10545,7 @@ if $search_ncurses then echo "checking "location of ncurses.h file"" 1>&6 -echo "configure:10544: checking "location of ncurses.h file"" >&5 +echo "configure:10549: checking "location of ncurses.h file"" >&5 if $search_ncurses @@ -10680,7 +10685,7 @@ if $search_ncurses then cat > conftest.$ac_ext < EOF @@ -10706,7 +10711,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -10766,10 +10771,10 @@ else # check for ncurses version, to properly ifdef mouse-fix echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10770: checking for ncurses version" >&5 +echo "configure:10775: checking for ncurses version" >&5 ncurses_version=unknown cat > conftest.$ac_ext < @@ -10813,12 +10818,12 @@ for ac_func in resizeterm keyok do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10817: checking for $ac_func" >&5 +echo "configure:10822: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10889,7 +10894,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF #define SLANG_TERMINFO 1 @@ -10922,7 +10927,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10926: checking for tgoto in -ltermcap" >&5 +echo "configure:10931: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10930,7 +10935,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11003,7 +11008,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11007: checking for tgoto in -ltermcap" >&5 +echo "configure:11012: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11011,7 +11016,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11062,7 +11067,7 @@ install_saver="yes" echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:11066: checking for pam_start in -lpam" >&5 +echo "configure:11071: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11070,7 +11075,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpam -ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11124,7 +11129,7 @@ else echo $ac_n "checking for -lXpm""... $ac_c" 1>&6 -echo "configure:11128: checking for -lXpm" >&5 +echo "configure:11133: checking for -lXpm" >&5 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11140,7 +11145,7 @@ has_xpm_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -11150,7 +11155,7 @@ XpmLibraryVersion(); ; return 0; } EOF -if { (eval echo configure:11154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_xpm=yes else @@ -11172,7 +11177,7 @@ echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6 -echo "configure:11176: checking for X11 non-rectangular shape extension" >&5 +echo "configure:11181: checking for X11 non-rectangular shape extension" >&5 if eval "test \"`echo '$''{'ac_cv_has_shape'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11188,7 +11193,7 @@ has_shape_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -11203,7 +11208,7 @@ ; return 0; } EOF -if { (eval echo configure:11207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_shape=yes else @@ -11239,7 +11244,7 @@ echo else echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6 -echo "configure:11243: checking for setupterm in -lcurses" >&5 +echo "configure:11248: checking for setupterm in -lcurses" >&5 ac_lib_var=`echo curses'_'setupterm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11247,7 +11252,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11275,7 +11280,7 @@ echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -11288,7 +11293,7 @@ ; return 0; } EOF -if { (eval echo configure:11292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* LIBS="$LIBS -lcurses" @@ -11596,6 +11601,7 @@ s%@HAVE_GNORBA_FALSE@%$HAVE_GNORBA_FALSE%g s%@GNORBA_CFLAGS@%$GNORBA_CFLAGS%g s%@GNORBA_LIBS@%$GNORBA_LIBS%g +s%@gnomeicondir@%$gnomeicondir%g s%@mx@%$mx%g s%@gmcdep@%$gmcdep%g s%@libgtkedit@%$libgtkedit%g diff -ruN old/mc-4.5.13/configure.in new/mc-4.5.14/configure.in --- old/mc-4.5.13/configure.in Wed Feb 10 19:41:11 1999 +++ new/mc-4.5.14/configure.in Thu Feb 11 21:44:21 1999 @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=4.5.13 +VERSION=4.5.14 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(VERSION) @@ -489,6 +489,7 @@ mx="" gmcdep="" libgtkedit="" + AC_SUBST(insticons) GNOME_INIT_HOOK([ mx=mx @@ -500,7 +501,9 @@ else xvers="Gnome+$xvers" fi + gnomeicondir=`gnome-config --prefix`/share/pixmaps ]) +AC_SUBST(gnomeicondir) AC_SUBST(mx) AC_SUBST(gmcdep) AC_SUBST(libgtkedit) diff -ruN old/mc-4.5.13/gnome/ChangeLog new/mc-4.5.14/gnome/ChangeLog --- old/mc-4.5.13/gnome/ChangeLog Wed Feb 10 19:41:17 1999 +++ new/mc-4.5.14/gnome/ChangeLog Thu Feb 11 21:44:25 1999 @@ -1,3 +1,50 @@ +1999-02-11 Federico Mena Quintero + + * gdesktop-icon.c (set_icon): Do not destroy the image if it is + the same as the old one. Sigh, imlib really needs proper + refcounting. + + * gscreen.c: Use gpopup_do_popup() until the new version is + finished. + + * gpopup2.c (create_actions): Made the action selection logic + simpler. + (gpopup_do_popup2): Now can only operate on panels. + (file_actions): Sanitized the actions a bit. + + * gutil.c (my_system_get_child_pid): sa_handler must be + gnome_sigchld_handler, not gnome_sigchld_installed. + + * gpopup.c (dicon_properties): Do not call reread_cmd(). This is + a hack until the menus for panels/desktop are finished. + + * gscreen.c (panel_file_list_press_row): Use gpopup_do_popup2(). + +1999-02-11 Miguel de Icaza + + * gutil.c (my_system_get_child_pid): Implement a erase-temp-file + when child dies instead of waiting for child that was launched + from shell/temp-file to finish. + +1999-02-11 Federico Mena Quintero + + * gdesktop.c (desktop_icon_info_place): Better icon placement by + rounding to the proper slot number. + (select_range): Simpler range selection for exact Windows behavior. + + * gdnd.c (drop_on_directory): Do not ask for the action twice. + This was a leftover from a bit of code reorganization. + + * gscreen.c (panel_icon_list_button_press): Fixed "=" -> "!=" + typo. + +1999-02-10 Miguel de Icaza + + * gaction.c (gmc_open_filename): Add support for running .desktop + files. + Made const correct. + (gmc_view): Made const correct. + 1999-02-10 Federico Mena Quintero * Makefile.in (ICONS): Added i-fifo.png to the list of icons. @@ -63,7 +110,6 @@ scan_begin and scan_end signals of the tree -- these will set the cursor to a watch while the tree is being scanned. ->>>>>>> 1.321 1999-02-08 Miguel de Icaza * gdesktop.c (desktop_icon_info_destroy): Delete the metadata diff -ruN old/mc-4.5.13/gnome/Makefile.in new/mc-4.5.14/gnome/Makefile.in --- old/mc-4.5.13/gnome/Makefile.in Wed Feb 10 19:41:17 1999 +++ new/mc-4.5.14/gnome/Makefile.in Thu Feb 11 21:44:25 1999 @@ -212,7 +212,9 @@ $(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS) mc.keys: mc.keys.in Makefile - sed -e 's^\@icondir\@^$(icondir)^g' < mc.keys.in > mc.keys.tmp \ + sed -e 's^\@icondir\@^$(icondir)^g' \ + -e 's^\@gnomeicondir\@^$(gnomeicondir)^g' \ + < mc.keys.in > mc.keys.tmp \ && mv mc.keys.tmp mc.keys mc.keys.in: mc.keys.in.in Makefile.in ../config.status diff -ruN old/mc-4.5.13/gnome/gaction.c new/mc-4.5.14/gnome/gaction.c --- old/mc-4.5.13/gnome/gaction.c Wed Feb 10 19:41:18 1999 +++ new/mc-4.5.14/gnome/gaction.c Thu Feb 11 21:44:25 1999 @@ -26,7 +26,8 @@ int gmc_open_filename (char *fname, GList *args) { - char *mime_type, *cmd; + const char *mime_type; + const char *cmd; char *buf; int size; @@ -59,10 +60,52 @@ gmc_execute (fname, cmd); return 1; } + + if (strcmp (mime_type, "application/x-gnome-app-info") == 0){ + GnomeDesktopEntry *entry; + + entry = gnome_desktop_entry_load (fname); + if (entry){ + gnome_desktop_entry_launch (entry); + gnome_desktop_entry_free (entry); + } + } + return 0; } int +gmc_edit_filename (char *fname) +{ + const char *mime_type; + const char *cmd; + char *buf; + int size; + + if (gnome_metadata_get (fname, "edit", &size, &buf) == 0){ + gmc_execute (fname, buf); + g_free (buf); + return 1; + } + + mime_type = gnome_mime_type_or_default (fname, NULL); + if (!mime_type) + return 0; + + + cmd = gnome_mime_get_value (mime_type, "edit"); + + if (cmd){ + gmc_execute (fname, cmd); + return 1; + } + + do_edit (fname); + return 0; +} + + +int gmc_open (file_entry *fe) { return gmc_open_filename (fe->fname, NULL); @@ -77,7 +120,7 @@ int gmc_view (char *filename, int start_line) { - char *mime_type, *cmd; + const char *mime_type, *cmd; char *buf; int size; diff -ruN old/mc-4.5.13/gnome/gconf.h new/mc-4.5.14/gnome/gconf.h --- old/mc-4.5.13/gnome/gconf.h Wed Feb 10 19:41:20 1999 +++ new/mc-4.5.14/gnome/gconf.h Thu Feb 11 21:44:25 1999 @@ -37,7 +37,9 @@ #define PORT_LIST_MODE_NAME "gnome_list_mode" #define PORT_LIST_MODE_DEFAULT "icons" -#define ICONS_PER_ROW(x) (gnome_icon_list_get_items_per_line (GNOME_ICON_LIST(x->icons))) +#define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child) +#define ILIST_FROM_SW(panel_list) GNOME_ICON_LIST (GTK_BIN (panel_list)->child) +#define ICONS_PER_ROW(x) (gnome_icon_list_get_items_per_line (GNOME_ICON_LIST(ILIST_FROM_SW(x->icons)))) #define mi_getch() fprintf (stderr, "mi_getch is not implemented in this port\n") #define frontend_run_dlg(x) gtkrundlg_event (x) diff -ruN old/mc-4.5.13/gnome/gdesktop-icon.c new/mc-4.5.14/gnome/gdesktop-icon.c --- old/mc-4.5.13/gnome/gdesktop-icon.c Wed Feb 10 19:41:18 1999 +++ new/mc-4.5.14/gnome/gdesktop-icon.c Thu Feb 11 21:44:25 1999 @@ -201,7 +201,7 @@ "height", (double) im->rgb_height, NULL); - if (old_im) + if (old_im != im) gdk_imlib_destroy_image (old_im); } diff -ruN old/mc-4.5.13/gnome/gdesktop.c new/mc-4.5.14/gnome/gdesktop.c --- old/mc-4.5.13/gnome/gdesktop.c Wed Feb 10 19:41:18 1999 +++ new/mc-4.5.14/gnome/gdesktop.c Thu Feb 11 21:44:25 1999 @@ -245,8 +245,8 @@ /* Increase the number of icons in the corresponding slot */ - u = xpos / DESKTOP_SNAP_X; - v = ypos / DESKTOP_SNAP_Y; + u = (xpos + DESKTOP_SNAP_X / 2) / DESKTOP_SNAP_X; + v = (ypos + DESKTOP_SNAP_X / 2) / DESKTOP_SNAP_Y; dii->slot = u * layout_rows + v; layout_slots[dii->slot].num_icons++; @@ -505,8 +505,6 @@ int u, v; GList *l; DesktopIconInfo *ldii; - DesktopIconInfo *min_udii, *min_vdii; - DesktopIconInfo *max_udii, *max_vdii; /* Find out the selection range */ @@ -521,41 +519,17 @@ if (du < lu) { min_u = du; max_u = lu; - min_udii = dii; - max_udii = last_selected_icon; } else { min_u = lu; max_u = du; - - /* Even if the icons are on the same slot, their positions may - * need adjusting with respect to each other. - */ - if (du != lu || last_selected_icon->x < dii->x) { - min_udii = last_selected_icon; - max_udii = dii; - } else { - min_udii = dii; - max_udii = last_selected_icon; - } } if (dv < lv) { min_v = dv; max_v = lv; - min_vdii = dii; - max_vdii = last_selected_icon; } else { min_v = lv; max_v = dv; - - /* Same as above */ - if (dv != lv || last_selected_icon->y < dii->y) { - min_vdii = last_selected_icon; - max_vdii = dii; - } else { - min_vdii = dii; - max_vdii = last_selected_icon; - } } /* Select all the icons in the rectangle */ @@ -564,12 +538,6 @@ for (v = min_v; v <= max_v; v++) for (l = l_slots (u, v).icons; l; l = l->next) { ldii = l->data; - - if ((u == min_u && ldii->x < min_udii->x) - || (v == min_v && ldii->y < min_vdii->y) - || (u == max_u && ldii->x > max_udii->x) - || (v == max_v && ldii->y > max_vdii->y)) - continue; desktop_icon_select (DESKTOP_ICON (ldii->dicon), sel); ldii->selected = sel; diff -ruN old/mc-4.5.13/gnome/gdnd.c new/mc-4.5.14/gnome/gdnd.c --- old/mc-4.5.13/gnome/gdnd.c Wed Feb 10 19:41:18 1999 +++ new/mc-4.5.14/gnome/gdnd.c Thu Feb 11 21:44:25 1999 @@ -289,18 +289,9 @@ /* Drop stuff on a directory */ static int -drop_on_directory (GdkDragContext *context, GtkSelectionData *selection_data, char *destdir) +drop_on_directory (GdkDragContext *context, GtkSelectionData *selection_data, + GdkDragAction action, char *destdir) { - GdkDragAction action; - - if (context->action == GDK_ACTION_ASK) { - action = get_action (context); - - if (action == GDK_ACTION_ASK) - return FALSE; - } else - action = context->action; - if (gdnd_drag_context_has_target (context, TARGET_URI_LIST)) drop_uri_list_on_directory (context, selection_data, action, destdir); else if (gdnd_drag_context_has_target (context, TARGET_URL)) @@ -402,7 +393,7 @@ action = context->action; if (S_ISDIR (dest_fe->buf.st_mode) || dest_fe->f.link_to_dir) - return drop_on_directory (context, selection_data, dest_name); + return drop_on_directory (context, selection_data, action, dest_name); else return drop_on_file (context, selection_data, dest_fe, dest_name); } diff -ruN old/mc-4.5.13/gnome/gmain.h new/mc-4.5.14/gnome/gmain.h --- old/mc-4.5.13/gnome/gmain.h Wed Feb 10 19:41:20 1999 +++ new/mc-4.5.14/gnome/gmain.h Thu Feb 11 21:44:25 1999 @@ -38,6 +38,7 @@ void gtkrundlg_event (Dlg_head *h); int gmc_open (file_entry *fe); int gmc_open_filename (char *fname, GList *args); +int gmc_edit_filename (char *fname); int gmc_view (char *filename, int start_line); void x_show_info (WInfo *info, struct my_statfs *s, struct stat *b); void x_create_info (Dlg_head *h, widget_data parent, WInfo *info); diff -ruN old/mc-4.5.13/gnome/gpopup.c new/mc-4.5.14/gnome/gpopup.c --- old/mc-4.5.13/gnome/gpopup.c Wed Feb 10 19:41:20 1999 +++ new/mc-4.5.14/gnome/gpopup.c Thu Feb 11 21:44:25 1999 @@ -77,7 +77,10 @@ static void panel_action_edit (GtkWidget *widget, WPanel *panel) { - edit_cmd (panel); + char *full = g_concat_dir_and_file (panel->cwd, selection (panel)->fname); + + gmc_edit_filename (full); + g_free (full); } /* Pops up the icon properties pages */ @@ -103,6 +106,7 @@ gtk_widget_destroy (dlg); g_free(path); + if (retval) reread_cmd (); } @@ -394,7 +398,8 @@ { char *action; int movedir; - char *key, *mime_type, *val; + char *key; + const char *mime_type, *val;; action = get_label_text (item); key = gtk_object_get_user_data (GTK_OBJECT (item)); @@ -418,7 +423,7 @@ GnomeUIInfo *a_uiinfo; int i; GtkSignalFunc regex_callback; - char *mime_type; + const char *mime_type; GList *keys, *l; GnomeUIInfo uiinfo[] = { { 0 }, diff -ruN old/mc-4.5.13/gnome/gpopup.h new/mc-4.5.14/gnome/gpopup.h --- old/mc-4.5.13/gnome/gpopup.h Wed Feb 10 19:41:20 1999 +++ new/mc-4.5.14/gnome/gpopup.h Thu Feb 11 21:44:25 1999 @@ -13,9 +13,8 @@ #include #include "panel.h" #include "gdesktop.h" -int gpopup_do_popup2 (GdkEventButton *event, - WPanel *panel, GList *file_list, - gboolean on_selected); + +int gpopup_do_popup2 (GdkEventButton *event, WPanel *panel); int gpopup_do_popup (GdkEventButton *event, WPanel *from_panel, DesktopIconInfo *dii, diff -ruN old/mc-4.5.13/gnome/gpopup2.c new/mc-4.5.14/gnome/gpopup2.c --- old/mc-4.5.13/gnome/gpopup2.c Wed Feb 10 19:41:20 1999 +++ new/mc-4.5.14/gnome/gpopup2.c Thu Feb 11 21:44:25 1999 @@ -25,28 +25,29 @@ #include "gnome-file-property-dialog.h" #define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child) -/* Flags for the popup menu entries. They specify to which kinds of files an entry is valid for. */ +/* Flags for the popup menu entries. They specify to which kinds of files an + * entry is valid for. + */ enum { F_ALL = 1 << 0, /* Applies to all files */ F_REGULAR = 1 << 1, /* Applies only to regular files */ - F_SYMLINK = 1 << 2, /* Applies only to symlink */ - F_SINGLE = 1 << 3, /* Applies only to a single file, not to a multiple selection */ + F_SYMLINK = 1 << 2, /* Applies only to symlinks */ + F_SINGLE = 1 << 3, /* Applies only to a single file, not to multiple files */ F_NOTDIR = 1 << 4, /* Applies to non-directories */ F_DICON = 1 << 5, /* Applies only to desktop icons */ - F_NOTDEV = 1 << 6, /* Applies to non-devices only (ie. reg, lnk, dir) */ - F_ADVANCED = 1 << 7 /* Only appears in (non-existent) Advanced mode */ + F_NOTDEV = 1 << 6, /* Applies to non-devices only (ie. reg, lnk, dir) */ + F_ADVANCED = 1 << 7 /* Only appears in advanced mode */ }; /* typedefs */ -typedef struct action { +struct action { char *text; /* Menu item text */ int flags; /* Flags from the above enum */ gpointer callback; /* Callback for menu item */ -} action; +}; -/* Prototypes */ /* Multiple File commands */ -static void panel_action_with (GtkWidget *widget, WPanel *panel); +static void panel_action_open_with (GtkWidget *widget, WPanel *panel); static void handle_open (GtkWidget *widget, WPanel *panel); static void handle_view (GtkWidget *widget, WPanel *panel); static void handle_view_unfiltered (GtkWidget *widget, WPanel *panel); @@ -71,11 +72,9 @@ /* global vars */ extern int we_can_afford_the_speed; -static action file_actions[] = { - { N_("Properties"), F_SINGLE | F_ALL, handle_properties }, - { "", F_SINGLE | F_ALL, NULL }, - { N_("Open"), F_NOTDEV, handle_open }, - { "", F_NOTDEV, NULL }, +static struct action file_actions[] = { + { N_("Open"), F_NOTDEV, handle_open }, + { "", F_NOTDEV, NULL }, { N_("Open with..."), F_REGULAR | F_SINGLE, handle_open_with }, { N_("View"), F_REGULAR | F_SINGLE, handle_view }, { N_("View Unfiltered"), F_REGULAR | F_ADVANCED | F_SINGLE, handle_view_unfiltered }, @@ -84,13 +83,15 @@ { N_("Copy..."), F_ALL, handle_copy }, { N_("Delete"), F_ALL, handle_delete }, { N_("Move..."), F_ALL, handle_move }, - { "", F_SINGLE, NULL }, { N_("Hard Link..."), F_ADVANCED | F_SINGLE, handle_hard_link }, - { N_("Link..."), F_SINGLE, handle_symlink }, + { N_("Symlink..."), F_SINGLE, handle_symlink }, { N_("Edit Symlink..."), F_SYMLINK | F_SINGLE, handle_edit_symlink }, + { "", F_SINGLE | F_ALL, NULL }, + { N_("Properties..."), F_SINGLE | F_ALL, handle_properties }, { NULL, 0, NULL } }; +#if 0 static action generic_actions[] = { { N_("NEW(FIXME)"), F_ALL, NULL }, { "", F_ALL, NULL }, @@ -101,7 +102,7 @@ { N_("Logout"), F_DICON, handle_logout }, { NULL, 0, NULL } }; - +#endif /* This is our custom signal connection function for popup menu items -- see below for the * marshaller information. We pass the original callback function as the data pointer for the @@ -178,42 +179,20 @@ /* Creates the menu items for the standard actions. Returns the position at * which additional menu items should be inserted. */ -static int -create_actions (GtkWidget *menu, gint flags, gboolean on_selected, WPanel *panel) +static void +create_actions (GtkWidget *menu, gint flags, WPanel *panel) { struct action *action; - gint pos = 0; - gint error_correction; + int pos; GnomeUIInfo uiinfo[] = { { 0 }, GNOMEUIINFO_END }; - if (on_selected) - action = file_actions; - else - action = generic_actions; - - - for (;action->text; action++) { - error_correction = 0; - /* Let's see if we want this particular entry */ - /* we need to special-case F_SINGLE */ - if (action->flags & F_SINGLE) { - if (!(flags & F_SINGLE)) - continue; - else if (action->flags != F_SINGLE) - error_correction |= F_SINGLE; - } - /* same with advanced */ - if (action->flags & F_ADVANCED) { - if (!(flags & F_ADVANCED)) - continue; - else - error_correction |= F_ADVANCED; - } + pos = 0; - if ((flags & (action->flags - error_correction)) == 0) + for (action = file_actions; action->text; action++) { + if ((action->flags & flags) != action->flags) continue; if (action->text[0]) { @@ -231,11 +210,8 @@ } else uiinfo[0].type = GNOME_APP_UI_SEPARATOR; - fill_menu (GTK_MENU_SHELL (menu), uiinfo, pos); - pos++; + fill_menu (GTK_MENU_SHELL (menu), uiinfo, pos++); } - - return pos; } /* Convenience callback to exit the main loop of a modal popup menu when it is deactivated*/ @@ -262,81 +238,62 @@ return -1; } -/* Create a context menu. It can take either a WPanel or a GnomeDesktopEntry. - * One of them should be set to NULL. - */ #define REMOVE(x,f) x &= ~f int -gpopup_do_popup2 (GdkEventButton *event, - WPanel *panel, GList *file_list, - gboolean on_selected) +gpopup_do_popup2 (GdkEventButton *event, WPanel *panel) { GtkWidget *menu; - GList *list; gint flags = F_ALL | F_REGULAR | F_SYMLINK | F_SINGLE | F_NOTDEV | F_NOTDIR; struct stat s; guint id; - gint i; - gint count = 0; + int i; + int marked; g_return_val_if_fail (event != NULL, -1); + g_return_val_if_fail (panel != NULL, -1); menu = gtk_menu_new (); - /* Connect to the deactivation signal to be able to quit our - modal main loop */ + /* Connect to the deactivation signal to be able to quit our modal main + * loop. + */ id = gtk_signal_connect (GTK_OBJECT (menu), "deactivate", (GtkSignalFunc) menu_shell_deactivated, NULL); - if (file_list == NULL) { - /* make the file list */ - for (i = 0; i < panel->count; i++) { - if (!strcmp (panel->dir.list [i].fname, "..")) { - continue; - } - if (panel->dir.list [i].f.marked) { - s.st_mode = panel->dir.list[i].buf.st_mode; - /* do flag stuff */ - if (S_ISLNK (s.st_mode)) - mc_stat (panel->dir.list [i].fname, &s); - else - REMOVE (flags, F_SYMLINK); - if (S_ISDIR (s.st_mode)) - REMOVE (flags, F_NOTDIR); - if (!S_ISREG (s.st_mode)) - REMOVE (flags, F_REGULAR); - if (count == 1) - REMOVE (flags, F_SINGLE); - if (!S_ISREG (s.st_mode) && !S_ISDIR (s.st_mode)) - REMOVE (flags, F_NOTDEV); - count++; - } - } - } else { - /* we already have the file list, but we need to create the flags */ - for (list = file_list; list; list = list->next) { - mc_lstat (list->data, &s); - if (S_ISLNK (s.st_mode)) - mc_stat (list->data, &s); - else - REMOVE (flags, F_SYMLINK); - - if (S_ISDIR (s.st_mode)) - REMOVE (flags, F_NOTDIR); - if (!S_ISREG (s.st_mode)) - REMOVE (flags, F_REGULAR); - if (count == 1) - REMOVE (flags, F_SINGLE); - if (!S_ISREG (s.st_mode) && !S_ISDIR (s.st_mode)) - REMOVE (flags, F_NOTDEV); - count++; - } + marked = 0; + + for (i = 0; i < panel->count; i++) { + if (!strcmp (panel->dir.list [i].fname, "..") || !panel->dir.list[i].f.marked) + continue; + + marked++; + + s = panel->dir.list[i].buf; + + if (S_ISLNK (s.st_mode)) + mc_stat (panel->dir.list [i].fname, &s); + else + REMOVE (flags, F_SYMLINK); + + if (S_ISDIR (s.st_mode)) + REMOVE (flags, F_NOTDIR); + + if (!S_ISREG (s.st_mode)) + REMOVE (flags, F_REGULAR); + + if (S_ISCHR (s.st_mode) || S_ISBLK (s.st_mode)) + REMOVE (flags, F_NOTDEV); } + g_assert (marked > 0); + + if (marked > 1) + REMOVE (flags, F_SINGLE); + /* Fill the menu */ - create_actions (menu, flags, on_selected, panel); + create_actions (menu, flags, panel); /* Run it */ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); @@ -345,8 +302,10 @@ gtk_grab_remove (menu); gtk_signal_disconnect (GTK_OBJECT (menu), id); - /* FIXME: FIXME: FIXME: free the stoopid memory */ - return get_active_index (GTK_MENU (menu)); + + i = get_active_index (GTK_MENU (menu)); + gtk_widget_destroy (menu); + return i; } static void @@ -439,7 +398,7 @@ handle_open_with (GtkWidget *widget, WPanel *panel) { char *command; - + command = input_expand_dialog (_(" Open with..."), _("Enter extra arguments:"), panel->dir.list [panel->selected].fname); diff -ruN old/mc-4.5.13/gnome/gscreen.c new/mc-4.5.14/gnome/gscreen.c --- old/mc-4.5.13/gnome/gscreen.c Wed Feb 10 19:41:20 1999 +++ new/mc-4.5.14/gnome/gscreen.c Thu Feb 11 21:44:25 1999 @@ -78,12 +78,6 @@ GtkWidget *drag_multiple_ok = NULL; -#define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child) -#ifdef NEW_GNOME_LIBS -#define ILIST_FROM_SW(panel_list) GNOME_ICON_LIST (GTK_BIN (panel_list)->child) -#endif - - void repaint_file (WPanel *panel, int file_index, int move, int attr, int isstatus) { @@ -223,11 +217,7 @@ static void panel_fill_panel_icons (WPanel *panel) { -#ifdef NEW_GNOME_LIBS GnomeIconList *icons = ILIST_FROM_SW (panel->icons); -#else - GnomeIconList *icons = GNOME_ICON_LIST (panel->icons); -#endif const int top = panel->count; const int selected = panel->selected; int i; @@ -320,11 +310,7 @@ display_mini_info (panel); if (panel->list_type == list_icons){ -#ifdef NEW_GNOME_LIBS GnomeIconList *list = ILIST_FROM_SW (panel->icons); -#else - GnomeIconList *list = GNOME_ICON_LIST (panel->icons); -#endif gnome_icon_list_select_icon (list, panel->selected); @@ -351,11 +337,7 @@ int selected = panel->selected; if (panel->list_type == list_icons) -#ifdef NEW_GNOME_LIBS gnome_icon_list_unselect_all (ILIST_FROM_SW (panel->icons), NULL, NULL); -#else - gnome_icon_list_unselect_all (GNOME_ICON_LIST (panel->icons), NULL, NULL); -#endif else gtk_clist_unselect_all (CLIST_FROM_SW (panel->list)); @@ -484,7 +466,8 @@ event->button.x, event->button.y, &row, &column); gtk_clist_select_row (GTK_CLIST (file_list), row, 0); - gpopup_do_popup ((GdkEventButton *) event, panel, NULL, row, panel->dir.list[row].fname); + gpopup_do_popup ((GdkEventButton *) event, panel, NULL, + row, panel->dir.list[row].fname); } return TRUE; } @@ -1161,21 +1144,13 @@ { GtkAdjustment *va; -#ifdef NEW_GNOME_LIBS va = scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel->icons)); -#else - va = GNOME_ICON_LIST (panel->icons)->adj; -#endif if (y < 10) { if (va->value > va->lower) return TRUE; } else { -#ifdef NEW_GNOME_LIBS if (y > (GTK_WIDGET (ILIST_FROM_SW (panel->icons))->allocation.height - 10)) { -#else - if (y > (GTK_WIDGET (panel->icons)->allocation.height - 10)) { -#endif if (va->value < va->upper - va->page_size) return TRUE; } @@ -1197,11 +1172,7 @@ GtkAdjustment *va; double v; -#ifdef NEW_GNOME_LIBS va = scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel->icons)); -#else - va = GNOME_ICON_LIST (panel->icons)->adj; -#endif if (panel->drag_motion_y < 10) { v = va->value - va->step_increment; @@ -1391,7 +1362,8 @@ switch (event->type){ case GDK_BUTTON_PRESS: if (event->button.button == 3) - gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, TRUE); + gpopup_do_popup ((GdkEventButton *) event, panel, NULL, + index, panel->dir.list[index].fname); break; case GDK_BUTTON_RELEASE: @@ -1459,10 +1431,13 @@ if (icon == -1) { if (event->button == 3) { - gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, FALSE); +#if 0 + g_warning ("FIXME: icon_list_button_press menu"); + gpopup_do_popup ((GdkEventButton *) event, panel, NULL, FALSE); +#endif return TRUE; } - } else if (event->button == 1) + } else if (event->button != 3) panel->maybe_start_drag = event->button; panel->click_x = event->x; @@ -1481,25 +1456,19 @@ static GtkWidget * panel_create_icon_display (WPanel *panel) { -#ifdef NEW_GNOME_LIBS GtkWidget *sw; -#endif GnomeIconList *ilist; -#ifdef NEW_GNOME_LIBS sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#endif ilist = GNOME_ICON_LIST ( gnome_icon_list_new_flags (90, NULL, (GNOME_ICON_LIST_IS_EDITABLE | GNOME_ICON_LIST_STATIC_TEXT))); -#ifdef NEW_GNOME_LIBS gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (ilist)); gtk_widget_show (GTK_WIDGET (ilist)); -#endif gnome_icon_list_set_separators (ilist, " /-_."); gnome_icon_list_set_row_spacing (ilist, 2); @@ -1563,11 +1532,7 @@ gtk_signal_connect (GTK_OBJECT (ilist), "drag_leave", GTK_SIGNAL_FUNC (panel_icon_list_drag_leave), panel); -#ifdef NEW_GNOME_LIBS return sw; -#else - return GTK_WIDGET (ilist); -#endif } static void @@ -2390,10 +2355,6 @@ GtkWidget *status_line, *filter, *vbox, *ministatus_box; GtkWidget *cwd; GtkWidget *dock; -#ifdef NEW_GNOME_LIBS -#else - GtkWidget *box; -#endif GnomeUIBuilderData uibdata; panel->xwindow = gtk_widget_get_toplevel (GTK_WIDGET (panel->widget.wdata)); @@ -2420,40 +2381,21 @@ panel->icons = panel_create_icon_display (panel); gtk_widget_show (panel->icons); -#ifdef NEW_GNOME_LIBS -#else - panel->scrollbar = gtk_vscrollbar_new (GNOME_ICON_LIST (panel->icons)->adj); - gtk_widget_show (panel->scrollbar); -#endif - + panel->list = panel_create_file_list (panel); gtk_widget_ref (panel->icons); gtk_widget_ref (panel->list); -#ifdef NEW_GNOME_LIBS -#else - box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (box), panel->icons, TRUE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (box), panel->scrollbar, FALSE, TRUE, 0); - gtk_widget_show (box); -#endif - panel->panel_listbox = gtk_event_box_new (); gtk_widget_show (panel->panel_listbox); gtk_container_add (GTK_CONTAINER (panel->panel_listbox), panel->list); -#ifdef NEW_GNOME_LIBS gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), panel->icons, NULL); -#else - gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), box, NULL); -#endif gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), panel->panel_listbox, NULL); - gtk_notebook_set_page (GTK_NOTEBOOK (panel->notebook), panel->list_type == list_icons ? 0 : 1); -#ifdef NEW_GNOME_LIBS + gtk_notebook_set_page (GTK_NOTEBOOK (panel->notebook), + panel->list_type == list_icons ? 0 : 1); + gtk_widget_show (panel->icons); -#else - gtk_widget_show_all (box); -#endif gtk_widget_show (panel->list); gtk_widget_show (panel->notebook); diff -ruN old/mc-4.5.13/gnome/gutil.c new/mc-4.5.14/gnome/gutil.c --- old/mc-4.5.13/gnome/gutil.c Wed Feb 10 19:41:20 1999 +++ new/mc-4.5.14/gnome/gutil.c Thu Feb 11 21:44:25 1999 @@ -48,11 +48,67 @@ #include #include "global.h" +static struct sigaction previous_sigchld; +static int child_died_notify_handler; + +/* + * A list of childs that were executed with a temporary file + * We remove the files when they die + */ +static GList *children; + +typedef struct { + pid_t pid; + char *temp_file; +} Child; + +/* + * Received when a child dies, notifies the high level routione + * that new input is available + */ +static void +gnome_sigchld_handler (int sig) +{ + char c; + + if (previous_sigchld.sa_handler != SIG_IGN && + previous_sigchld.sa_handler != SIG_DFL){ + (*previous_sigchld.sa_handler)(sig); + } + write (child_died_notify_handler, &c, sizeof (c)); +} + +/* + * Invoked from the main loop when a child has died + * deal with it + */ +static void +gnome_child_died (gpointer data, gint source, GdkInputCondition condition) +{ + GList *l; + char c; + + read (source, &c, sizeof (c)); + for (l = children; l; l = l->next){ + int status; + Child *child = l->data; + + if (child->pid == waitpid (child->pid, &status, WUNTRACED | WNOHANG)){ + children = g_list_remove (children, child); + + unlink (child->temp_file); + g_free (child->temp_file); + g_free (child); + } + } +} + int my_system_get_child_pid (int flags, const char *shell, const char *command, pid_t *pid) { struct sigaction ignore, save_intr, save_quit, save_stop; int status = 0, i; - + static int gnome_sigchld_installed; + ignore.sa_handler = SIG_IGN; sigemptyset (&ignore.sa_mask); ignore.sa_flags = 0; @@ -60,6 +116,21 @@ sigaction (SIGINT, &ignore, &save_intr); sigaction (SIGQUIT, &ignore, &save_quit); + if (!gnome_sigchld_installed){ + struct sigaction newsig; + int monitors [2]; + + pipe (monitors); + sigemptyset (&newsig.sa_mask); + newsig.sa_flags = 0; + newsig.sa_handler = gnome_sigchld_handler; + + sigaction (SIGCHLD, &newsig, &previous_sigchld); + gnome_sigchld_installed = 1; + + gdk_input_add (monitors [0], GDK_INPUT_READ, gnome_child_died, NULL); + } + if ((*pid = fork ()) < 0){ fprintf (stderr, "\n\nfork () = -1\n"); return -1; @@ -85,11 +156,16 @@ } else { int status; - if (flags & (EXECUTE_WAIT|EXECUTE_TEMPFILE)) + if (flags & EXECUTE_WAIT) waitpid (*pid, &status, 0); - - if (flags & EXECUTE_TEMPFILE) - unlink (command); + + if (flags & EXECUTE_TEMPFILE){ + Child *child; + + child = g_new (Child, 1); + child->pid = *pid; + child->temp_file = g_strdup (command); + } } /* We need to use _exit instead of exit to avoid * calling the atexit handlers (specifically the gdk atexit diff -ruN old/mc-4.5.13/gnome/mc.keys.in.in new/mc-4.5.14/gnome/mc.keys.in.in --- old/mc-4.5.13/gnome/mc.keys.in.in Wed Feb 10 19:41:18 1999 +++ new/mc-4.5.14/gnome/mc.keys.in.in Thu Feb 11 21:44:25 1999 @@ -19,7 +19,7 @@ icon-filename=@icondir@/gnome-package.png application/x-bzip: - icon-filename=@icondir@/compressed.xpm + icon-filename=@icondir@/gnome-compressed.png fm-view=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - open.extract.Extract=bzip2 -dc %f 2>/dev/null | tar xf - @@ -90,7 +90,7 @@ archive/ application/x-gzip: - icon-filename=@icondir@/compressed.xpm + icon-filename=@icondir@/gnome-compressed.png application/x-tex: icon-filename=@icondir@/tex.xpm @@ -108,6 +108,7 @@ application/x-cpio-compressed: fm-open=%cd %d/%p#ucpio/ fm-view=%view{ascii} gzip -dc '%f' | cpio -ictv + icon-filename=@icondir@/gnome-compressed.png application/x-cpio: fm-open=%cd %d/%p#ucpio/ @@ -131,7 +132,7 @@ open.netscape.View this file with Netscape=gnome-moz-remote %f application/vcard: - icon-filename=@icondir@/calendar.xpm + icon-filename=@gnomeicons@/gnome-calendar.png x-url/http: icon-filename=@icondir@/gnome-text-url.png @@ -151,6 +152,7 @@ application/x-troff-man-compressed: fm-view=%view{ascii,nroff} gunzip -dc %f | nroff @TROFFASCII@ @MANDOC@ + icon-filename=@icondir@/gnome-compressed.png application/x-troff-ms: fm-view=%view{ascii,nroff} nroff @TROFFASCII@ -ms %f diff -ruN old/mc-4.5.13/icons/Makefile.in new/mc-4.5.14/icons/Makefile.in --- old/mc-4.5.13/icons/Makefile.in Wed Feb 10 19:41:21 1999 +++ new/mc-4.5.14/icons/Makefile.in Thu Feb 11 21:44:25 1999 @@ -34,8 +34,8 @@ # are obtained # DECENTICONS = \ - c.xpm h.xpm calendar.xpm compressed.xpm html.xpm o.xpm \ - sound.xpm makefile.xpm word.xpm tex.xpm cc.xpm man.xpm \ + compressed.xpm o.xpm \ + sound.xpm makefile.xpm word.xpm tex.xpm man.xpm \ postscript.xpm tex.xpm text.xpm trash.xpm all: diff -ruN old/mc-4.5.13/new_icons/Makefile.in new/mc-4.5.14/new_icons/Makefile.in --- old/mc-4.5.13/new_icons/Makefile.in Wed Feb 10 19:41:20 1999 +++ new/mc-4.5.14/new_icons/Makefile.in Thu Feb 11 21:44:25 1999 @@ -43,6 +43,7 @@ gnome-application-x-c-source.png \ gnome-application-x-cc-source.png \ gnome-package.png \ + gnome-compressed.png \ gnome-core.png all: Binary files old/mc-4.5.13/new_icons/gnome-compressed.png and new/mc-4.5.14/new_icons/gnome-compressed.png differ diff -ruN old/mc-4.5.13/po/cat-id-tbl.c new/mc-4.5.14/po/cat-id-tbl.c --- old/mc-4.5.13/po/cat-id-tbl.c Wed Feb 10 19:41:22 1999 +++ new/mc-4.5.14/po/cat-id-tbl.c Thu Feb 11 21:44:27 1999 @@ -775,122 +775,129 @@ {" Problem reading from child ", 656}, {"Finished", 657}, {"Searching %s", 658}, - {"Searching", 659}, - {"Find file", 660}, - {"Usage: fixhlp \n", 661}, - {"fixhlp: Cannot open toc for writing", 662}, + {"Suspend", 659}, + {"Restart", 660}, + {"Searching", 661}, + {"Find file", 662}, + {"Change to this directory", 663}, + {"Search again", 664}, + {"View this file", 665}, + {"Edit this file", 666}, + {"Send the results to a Panel", 667}, + {"Usage: fixhlp \n", 668}, + {"fixhlp: Cannot open toc for writing", 669}, {"\ [Contents]\n\ Topics:\n\ -\n", 663}, +\n", 670}, {"\ Help file format error\n\ -", 664}, - {" Internal bug: Double start of link area ", 665}, - {" Can't find node [Contents] in help file ", 666}, - {" Help ", 667}, +", 671}, + {" Internal bug: Double start of link area ", 672}, + {" Can't find node [Contents] in help file ", 673}, + {" Help ", 674}, {"\ Can't open file %s \n\ - %s ", 668}, - {" Can't find node %s in help file ", 669}, - {"Index", 670}, - {"Prev", 671}, - {"&Move", 672}, - {"&Remove", 673}, - {"&Append", 674}, - {"&Insert", 675}, - {"New &Entry", 676}, - {"New &Group", 677}, - {"&Up", 678}, - {"&Add current", 679}, - {"Change &To", 680}, - {"Subgroup - press ENTER to see list", 681}, - {"Active VFS directories", 682}, - {"Directory hotlist", 683}, - {" Directory path ", 684}, - {" Directory label ", 685}, - {"Moving ", 686}, - {"New hotlist entry", 687}, - {"Directory label", 688}, - {"Directory path", 689}, - {" New hotlist group ", 690}, - {"Name of new group", 691}, - {"Label for \"%s\":", 692}, - {" Add to hotlist ", 693}, - {" Remove: ", 694}, + %s ", 675}, + {" Can't find node %s in help file ", 676}, + {"Index", 677}, + {"Prev", 678}, + {"&Move", 679}, + {"&Remove", 680}, + {"&Append", 681}, + {"&Insert", 682}, + {"New &Entry", 683}, + {"New &Group", 684}, + {"&Up", 685}, + {"&Add current", 686}, + {"Change &To", 687}, + {"Subgroup - press ENTER to see list", 688}, + {"Active VFS directories", 689}, + {"Directory hotlist", 690}, + {" Directory path ", 691}, + {" Directory label ", 692}, + {"Moving ", 693}, + {"New hotlist entry", 694}, + {"Directory label", 695}, + {"Directory path", 696}, + {" New hotlist group ", 697}, + {"Name of new group", 698}, + {"Label for \"%s\":", 699}, + {" Add to hotlist ", 700}, + {" Remove: ", 701}, {"\ \n\ Group not empty.\n\ - Remove it?", 695}, - {" Top level group ", 696}, - {"Hotlist is now kept in file ~/", 697}, - {"MC will load hotlist from ~/", 698}, - {"and then delete [Hotlist] section there", 699}, - {" Hotlist Load ", 700}, - {"MC was unable to write ~/", 701}, - {" file, your old hotlist entries were not deleted", 702}, - {"You have ~/", 703}, - {" file and [Hotlist] section in ~/", 704}, - {"Your ~/", 705}, - {" most probably was created\n", 706}, + Remove it?", 702}, + {" Top level group ", 703}, + {"Hotlist is now kept in file ~/", 704}, + {"MC will load hotlist from ~/", 705}, + {"and then delete [Hotlist] section there", 706}, + {" Hotlist Load ", 707}, + {"MC was unable to write ~/", 708}, + {" file, your old hotlist entries were not deleted", 709}, + {"You have ~/", 710}, + {" file and [Hotlist] section in ~/", 711}, + {"Your ~/", 712}, + {" most probably was created\n", 713}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 707}, +and is more actual than ~/", 714}, {"\ entries\n\ -\n", 708}, +\n", 715}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 709}, + Remove - remove old hotlist entries from ~/", 716}, {"\ Keep - keep your old entries; you will be asked\n\ the same question next time\n\ - Merge - add old entries to hotlist as group \"Entries from ~/", 710}, - {"&Merge", 711}, - {" Entries from ~/", 712}, - {" file your old hotlist entries were not deleted", 713}, - {"Midnight Commander %s", 714}, - {"Free nodes %d (%d%%) of %d", 715}, - {"No node information", 716}, - {"Free space ", 717}, - {" (%d%%) of ", 718}, - {"No space information", 719}, - {"Type: %s ", 720}, - {"non-local vfs", 721}, - {"Device: %s", 722}, - {"Filesystem: %s", 723}, - {"Accessed: %s", 724}, - {"Modified: %s", 725}, - {"Created: %s", 726}, - {"Size: ", 727}, - {" (%d blocks)", 728}, - {"Owner: %s/%s", 729}, - {"Links: %d", 730}, - {"Mode: %s (%04o)", 731}, - {"Location: %Xh:%Xh", 732}, - {"File: %s", 733}, - {"File: None", 734}, - {"&Vertical", 735}, - {"&Horizontal", 736}, - {"&Xterm hintbar", 737}, - {"h&Intbar visible", 738}, - {"&Keybar visible", 739}, - {"command &Prompt", 740}, - {"show &Mini status", 741}, - {"menu&Bar visible", 742}, - {"&Equal split", 743}, - {"pe&Rmissions", 744}, - {"&File types", 745}, - {"&Save", 746}, - {" Layout ", 747}, - {" Panel split ", 748}, - {" Highlight... ", 749}, - {" Other options ", 750}, - {"output lines", 751}, - {"Layout", 752}, - {" Learn keys ", 753}, - {" Teach me a key ", 754}, + Merge - add old entries to hotlist as group \"Entries from ~/", 717}, + {"&Merge", 718}, + {" Entries from ~/", 719}, + {" file your old hotlist entries were not deleted", 720}, + {"Midnight Commander %s", 721}, + {"Free nodes %d (%d%%) of %d", 722}, + {"No node information", 723}, + {"Free space ", 724}, + {" (%d%%) of ", 725}, + {"No space information", 726}, + {"Type: %s ", 727}, + {"non-local vfs", 728}, + {"Device: %s", 729}, + {"Filesystem: %s", 730}, + {"Accessed: %s", 731}, + {"Modified: %s", 732}, + {"Created: %s", 733}, + {"Size: ", 734}, + {" (%d blocks)", 735}, + {"Owner: %s/%s", 736}, + {"Links: %d", 737}, + {"Mode: %s (%04o)", 738}, + {"Location: %Xh:%Xh", 739}, + {"File: %s", 740}, + {"File: None", 741}, + {"&Vertical", 742}, + {"&Horizontal", 743}, + {"&Xterm hintbar", 744}, + {"h&Intbar visible", 745}, + {"&Keybar visible", 746}, + {"command &Prompt", 747}, + {"show &Mini status", 748}, + {"menu&Bar visible", 749}, + {"&Equal split", 750}, + {"pe&Rmissions", 751}, + {"&File types", 752}, + {"&Save", 753}, + {" Layout ", 754}, + {" Panel split ", 755}, + {" Highlight... ", 756}, + {" Other options ", 757}, + {"output lines", 758}, + {"Layout", 759}, + {" Learn keys ", 760}, + {" Teach me a key ", 761}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -899,331 +906,331 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 755}, - {" Cannot accept this key ", 756}, - {" You have entered \"%s\"", 757}, - {"OK", 758}, +and wait as well.", 762}, + {" Cannot accept this key ", 763}, + {" You have entered \"%s\"", 764}, + {"OK", 765}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 759}, - {"&Discard", 760}, +work fine. That's great.", 766}, + {"&Discard", 767}, {"\ Great! You have a complete terminal database!\n\ -All your keys work well.", 761}, - {"Learn keys", 762}, - {"Press all the keys mentioned here. After you have done it, check", 763}, - {"which keys are not marked with OK. Press space on the missing", 764}, - {"key, or click with the mouse to define it. Move around with Tab.", 765}, +All your keys work well.", 768}, + {"Learn keys", 769}, + {"Press all the keys mentioned here. After you have done it, check", 770}, + {"which keys are not marked with OK. Press space on the missing", 771}, + {"key, or click with the mouse to define it. Move around with Tab.", 772}, {"\ The Commander can't change to the directory that \n\ the subshell claims you are in. Perhaps you have \n\ deleted your working directory, or given yourself \n\ - extra access permissions with the \"su\" command? ", 766}, - {"Press any key to continue...", 767}, - {" The shell is already running a command ", 768}, - {"&Listing mode...", 769}, - {"&Quick view C-x q", 770}, - {"&Info C-x i", 771}, - {"&Sort order...", 772}, - {"&Filter...", 773}, - {"&Network link...", 774}, - {"FT&P link...", 775}, - {"&Drive... M-d", 776}, - {"&Rescan C-r", 777}, - {"&User menu F2", 778}, - {"&View F3", 779}, - {"Vie&w file... ", 780}, - {"&Filtered view M-!", 781}, - {"&Edit F4", 782}, - {"&Copy F5", 783}, - {"c&Hmod C-x c", 784}, - {"&Link C-x l", 785}, - {"&SymLink C-x s", 786}, - {"edit s&Ymlink C-x C-s", 787}, - {"ch&Own C-x o", 788}, - {"&Advanced chown ", 789}, - {"&Rename/Move F6", 790}, - {"&Mkdir F7", 791}, - {"&Delete F8", 792}, - {"&Quick cd M-c", 793}, - {"select &Group M-+", 794}, - {"u&Nselect group M-\\", 795}, - {"reverse selec&Tion M-*", 796}, - {"e&Xit F10", 797}, - {"&Directory tree", 798}, - {"&Find file M-?", 799}, - {"s&Wap panels C-u", 800}, - {"switch &Panels on/off C-o", 801}, - {"&Compare directories C-x d", 802}, - {"e&Xternal panelize C-x !", 803}, - {"show directory s&Izes", 804}, - {"command &History", 805}, - {"di&Rectory hotlist C-\\", 806}, - {"&Active VFS list C-x a", 807}, - {"&Background jobs C-x j", 808}, - {"&Undelete files (ext2fs only)", 809}, - {"&Listing format edit", 810}, - {"&Extension file edit", 811}, - {"&Menu file edit", 812}, - {"&Configuration...", 813}, - {"&Layout...", 814}, - {"c&Onfirmation...", 815}, - {"&Display bits...", 816}, - {"learn &Keys...", 817}, - {"&Virtual FS...", 818}, - {"&Save setup", 819}, - {" &Left ", 820}, - {" &Above ", 821}, - {" &File ", 822}, - {" &Command ", 823}, - {" &Options ", 824}, - {" &Right ", 825}, - {" &Below ", 826}, - {" Information ", 827}, + extra access permissions with the \"su\" command? ", 773}, + {"Press any key to continue...", 774}, + {" The shell is already running a command ", 775}, + {"&Listing mode...", 776}, + {"&Quick view C-x q", 777}, + {"&Info C-x i", 778}, + {"&Sort order...", 779}, + {"&Filter...", 780}, + {"&Network link...", 781}, + {"FT&P link...", 782}, + {"&Drive... M-d", 783}, + {"&Rescan C-r", 784}, + {"&User menu F2", 785}, + {"&View F3", 786}, + {"Vie&w file... ", 787}, + {"&Filtered view M-!", 788}, + {"&Edit F4", 789}, + {"&Copy F5", 790}, + {"c&Hmod C-x c", 791}, + {"&Link C-x l", 792}, + {"&SymLink C-x s", 793}, + {"edit s&Ymlink C-x C-s", 794}, + {"ch&Own C-x o", 795}, + {"&Advanced chown ", 796}, + {"&Rename/Move F6", 797}, + {"&Mkdir F7", 798}, + {"&Delete F8", 799}, + {"&Quick cd M-c", 800}, + {"select &Group M-+", 801}, + {"u&Nselect group M-\\", 802}, + {"reverse selec&Tion M-*", 803}, + {"e&Xit F10", 804}, + {"&Directory tree", 805}, + {"&Find file M-?", 806}, + {"s&Wap panels C-u", 807}, + {"switch &Panels on/off C-o", 808}, + {"&Compare directories C-x d", 809}, + {"e&Xternal panelize C-x !", 810}, + {"show directory s&Izes", 811}, + {"command &History", 812}, + {"di&Rectory hotlist C-\\", 813}, + {"&Active VFS list C-x a", 814}, + {"&Background jobs C-x j", 815}, + {"&Undelete files (ext2fs only)", 816}, + {"&Listing format edit", 817}, + {"&Extension file edit", 818}, + {"&Menu file edit", 819}, + {"&Configuration...", 820}, + {"&Layout...", 821}, + {"c&Onfirmation...", 822}, + {"&Display bits...", 823}, + {"learn &Keys...", 824}, + {"&Virtual FS...", 825}, + {"&Save setup", 826}, + {" &Left ", 827}, + {" &Above ", 828}, + {" &File ", 829}, + {" &Command ", 830}, + {" &Options ", 831}, + {" &Right ", 832}, + {" &Below ", 833}, + {" Information ", 834}, {"\ Using the fast reload option may not reflect the exact \n\ directory contents. In this cases you'll need to do a \n\ manual reload of the directory. See the man page for \n\ - the details. ", 828}, - {"Menu", 829}, - {"Thank you for using GNU Midnight Commander", 830}, - {"with mouse support on xterm%s.\n", 831}, - {" and the Linux console", 832}, - {"The TERM environment variable is unset!\n", 833}, - {"Library directory for the Midnight Commander: %s\n", 834}, - {"\ -Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 835}, - {"Geometry for the window", 836}, - {"GEOMETRY", 837}, - {"No windows opened at startup", 838}, - {"Force activation even if a server is already running", 839}, + the details. ", 835}, + {"Menu", 836}, + {"Thank you for using GNU Midnight Commander", 837}, + {"with mouse support on xterm%s.\n", 838}, + {" and the Linux console", 839}, + {"The TERM environment variable is unset!\n", 840}, + {"Library directory for the Midnight Commander: %s\n", 841}, + {"\ +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 842}, + {"Geometry for the window", 843}, + {"GEOMETRY", 844}, + {"No windows opened at startup", 845}, + {"Force activation even if a server is already running", 846}, {"\ Couldn't open tty line. You have to run mc without the -P flag.\n\ -On some systems you may want to run # `which mc`\n", 840}, - {" Notice ", 841}, +On some systems you may want to run # `which mc`\n", 847}, + {" Notice ", 848}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - files have been moved now\n", 842}, - {"safe de&Lete", 843}, - {"cd follows lin&Ks", 844}, - {"advanced cho&Wn", 845}, - {"l&Ynx-like motion", 846}, - {"Animation", 847}, - {"rotatin&G dash", 848}, - {"co&Mplete: show all", 849}, - {"&Use internal view", 850}, - {"use internal ed&It", 851}, - {"auto m&Enus", 852}, - {"&Auto save setup", 853}, - {"shell &Patterns", 854}, - {"Compute &Totals", 855}, - {"&Verbose operation", 856}, - {"&Fast dir reload", 857}, - {"mi&X all files", 858}, - {"&Drop down menus", 859}, - {"ma&Rk moves down", 860}, - {"show &Hidden files", 861}, - {"show &Backup files", 862}, - {"&Never", 863}, - {"on dumb &Terminals", 864}, - {"alwa&Ys", 865}, - {" Configure options ", 866}, - {" Panel options ", 867}, - {" Pause after run... ", 868}, - {"Configure options", 869}, - {"&Add new", 870}, - {" External panelize ", 871}, - {"External panelize", 872}, - {"Other command", 873}, - {" Add to external panelize ", 874}, - {" Enter command label: ", 875}, - {" I can't run external panelize while logged on a non local directory ", 876}, - {"Find *.orig after patching", 877}, - {"Find SUID and SGID programs", 878}, - {"Cannot invoke command.", 879}, - {"Pipe close failed", 880}, - {"Show this help message", 881}, - {"Display brief usage message", 882}, - {"MTime", 883}, - {"ATime", 884}, - {"CTime", 885}, - {"Permission", 886}, - {"Perm", 887}, - {"Nl", 888}, - {"Inode", 889}, - {"UID", 890}, - {"GID", 891}, - {" %s bytes in %d file%s", 892}, - {"Unknow tag on display format: ", 893}, - {" Do you really want to execute? ", 894}, - {" No action taken ", 895}, - {"RenMov", 896}, - {"Mkdir", 897}, + files have been moved now\n", 849}, + {"safe de&Lete", 850}, + {"cd follows lin&Ks", 851}, + {"advanced cho&Wn", 852}, + {"l&Ynx-like motion", 853}, + {"Animation", 854}, + {"rotatin&G dash", 855}, + {"co&Mplete: show all", 856}, + {"&Use internal view", 857}, + {"use internal ed&It", 858}, + {"auto m&Enus", 859}, + {"&Auto save setup", 860}, + {"shell &Patterns", 861}, + {"Compute &Totals", 862}, + {"&Verbose operation", 863}, + {"&Fast dir reload", 864}, + {"mi&X all files", 865}, + {"&Drop down menus", 866}, + {"ma&Rk moves down", 867}, + {"show &Hidden files", 868}, + {"show &Backup files", 869}, + {"&Never", 870}, + {"on dumb &Terminals", 871}, + {"alwa&Ys", 872}, + {" Configure options ", 873}, + {" Panel options ", 874}, + {" Pause after run... ", 875}, + {"Configure options", 876}, + {"&Add new", 877}, + {" External panelize ", 878}, + {"External panelize", 879}, + {"Other command", 880}, + {" Add to external panelize ", 881}, + {" Enter command label: ", 882}, + {" I can't run external panelize while logged on a non local directory ", 883}, + {"Find *.orig after patching", 884}, + {"Find SUID and SGID programs", 885}, + {"Cannot invoke command.", 886}, + {"Pipe close failed", 887}, + {"Show this help message", 888}, + {"Display brief usage message", 889}, + {"MTime", 890}, + {"ATime", 891}, + {"CTime", 892}, + {"Permission", 893}, + {"Perm", 894}, + {"Nl", 895}, + {"Inode", 896}, + {"UID", 897}, + {"GID", 898}, + {" %s bytes in %d file%s", 899}, + {"Unknow tag on display format: ", 900}, + {" Do you really want to execute? ", 901}, + {" No action taken ", 902}, + {"RenMov", 903}, + {"Mkdir", 904}, {"\ Can't chdir to %s \n\ - %s ", 898}, - {"Couldn't open named pipe %s\n", 899}, - {" The shell is still active. Quit anyway? ", 900}, - {" There are stopped jobs.", 901}, - {" Quit anyway? ", 902}, - {"Warning: Couldn't change to %s.\n", 903}, + %s ", 905}, + {"Couldn't open named pipe %s\n", 906}, + {" The shell is still active. Quit anyway? ", 907}, + {" There are stopped jobs.", 908}, + {" Quit anyway? ", 909}, + {"Warning: Couldn't change to %s.\n", 910}, {"\ Can't open the %s file for writing:\n\ -%s\n", 904}, - {"Copy \"%s\" directory to:", 905}, - {"Move \"%s\" directory to:", 906}, +%s\n", 911}, + {"Copy \"%s\" directory to:", 912}, + {"Move \"%s\" directory to:", 913}, {"\ Can't stat the destination \n\ - %s ", 907}, - {" The destination isn't a directory ", 908}, - {" Delete %s? ", 909}, - {"Static", 910}, - {"Dynamc", 911}, + %s ", 914}, + {" The destination isn't a directory ", 915}, + {" Delete %s? ", 916}, + {"Static", 917}, + {"Dynamc", 918}, {"\ Can't chdir to \"%s\" \n\ - %s ", 912}, - {"Rescan", 913}, - {"Forget", 914}, - {"Rmdir", 915}, + %s ", 919}, + {"Rescan", 920}, + {"Forget", 921}, + {"Rmdir", 922}, {"\ Can't write to the %s file:\n\ -%s\n", 916}, - {" Invalid shell pattern defination \"%c\". ", 917}, - {" Debug ", 918}, - {" ERROR: ", 919}, - {" True: ", 920}, - {" False: ", 921}, - {" Warning -- ignoring file ", 922}, +%s\n", 923}, + {" Invalid shell pattern defination \"%c\". ", 924}, + {" Debug ", 925}, + {" ERROR: ", 926}, + {" True: ", 927}, + {" False: ", 928}, + {" Warning -- ignoring file ", 929}, {"\ File %s is not owned by root or you or is world writable.\n\ -Using it may compromise your security", 923}, - {" I can't run programs while logged on a non local directory ", 924}, - {" User menu ", 925}, - {"name_trunc: too big", 926}, - {" Pipe failed ", 927}, - {" Dup failed ", 928}, +Using it may compromise your security", 930}, + {" I can't run programs while logged on a non local directory ", 931}, + {" User menu ", 932}, + {"name_trunc: too big", 933}, + {" Pipe failed ", 934}, + {" Dup failed ", 935}, {"\ File: \n\ \n\ - ", 929}, + ", 936}, {"\ \n\ \n\ -has been modified, do you want to save the changes?\n", 930}, - {" Save changes ", 931}, - {" Can't spawn child program ", 932}, - {" Empty output from child filter ", 933}, - {" Could not open file ", 934}, - {" Can't open file \"", 935}, +has been modified, do you want to save the changes?\n", 937}, + {" Save changes ", 938}, + {" Can't spawn child program ", 939}, + {" Empty output from child filter ", 940}, + {" Could not open file ", 941}, + {" Can't open file \"", 942}, {"\ Can't stat file \n\ - ", 936}, - {" Can't view: not a regular file ", 937}, - {"File: %s", 938}, - {" [grow]", 939}, - {"Searching for `%s'", 940}, - {" Search string not found ", 941}, - {" Invalid regular expression ", 942}, + ", 943}, + {" Can't view: not a regular file ", 944}, + {"File: %s", 945}, + {" [grow]", 946}, + {"Searching for `%s'", 947}, + {" Search string not found ", 948}, + {" Invalid regular expression ", 949}, {"\ The current line number is %d.\n\ - Enter the new line number:", 943}, - {" Enter regexp:", 944}, - {" Enter search string:", 945}, - {"Ascii", 946}, - {"Hex", 947}, - {"Line", 948}, - {"RxSrch", 949}, - {"EdText", 950}, - {"EdHex", 951}, - {"UnWrap", 952}, - {"Wrap", 953}, - {"HxSrch", 954}, - {"Raw", 955}, - {"Parse", 956}, - {"Unform", 957}, - {"Format", 958}, - {"Function key 1", 959}, - {"Function key 2", 960}, - {"Function key 3", 961}, - {"Function key 4", 962}, - {"Function key 5", 963}, - {"Function key 6", 964}, - {"Function key 7", 965}, - {"Function key 8", 966}, - {"Function key 9", 967}, - {"Function key 10", 968}, - {"Function key 11", 969}, - {"Function key 12", 970}, - {"Function key 13", 971}, - {"Function key 14", 972}, - {"Function key 15", 973}, - {"Function key 16", 974}, - {"Function key 17", 975}, - {"Function key 18", 976}, - {"Function key 19", 977}, - {"Function key 20", 978}, - {"Backspace key", 979}, - {"End key", 980}, - {"Up arrow key", 981}, - {"Down arrow key", 982}, - {"Left arrow key", 983}, - {"Right arrow key", 984}, - {"Home key", 985}, - {"Page Down key", 986}, - {"Page Up key", 987}, - {"Insert key", 988}, - {"Delete key", 989}, - {"Completion/M-tab", 990}, - {"+ on keypad", 991}, - {"- on keypad", 992}, - {"* on keypad", 993}, - {"Left arrow keypad", 994}, - {"Right arrow keypad", 995}, - {"Up arrow keypad", 996}, - {"Down arrow keypad", 997}, - {"Home on keypad", 998}, - {"End on keypad", 999}, - {"Page Down keypad", 1000}, - {"Page Up keypad", 1001}, - {"Insert on keypad", 1002}, - {"Delete on keypad", 1003}, - {"Enter on keypad", 1004}, - {"Slash on keypad", 1005}, - {"NumLock on keypad", 1006}, - {"Password:", 1007}, - {"Password", 1008}, - {"Ok", 1009}, + Enter the new line number:", 950}, + {" Enter regexp:", 951}, + {" Enter search string:", 952}, + {"Ascii", 953}, + {"Hex", 954}, + {"Line", 955}, + {"RxSrch", 956}, + {"EdText", 957}, + {"EdHex", 958}, + {"UnWrap", 959}, + {"Wrap", 960}, + {"HxSrch", 961}, + {"Raw", 962}, + {"Parse", 963}, + {"Unform", 964}, + {"Format", 965}, + {"Function key 1", 966}, + {"Function key 2", 967}, + {"Function key 3", 968}, + {"Function key 4", 969}, + {"Function key 5", 970}, + {"Function key 6", 971}, + {"Function key 7", 972}, + {"Function key 8", 973}, + {"Function key 9", 974}, + {"Function key 10", 975}, + {"Function key 11", 976}, + {"Function key 12", 977}, + {"Function key 13", 978}, + {"Function key 14", 979}, + {"Function key 15", 980}, + {"Function key 16", 981}, + {"Function key 17", 982}, + {"Function key 18", 983}, + {"Function key 19", 984}, + {"Function key 20", 985}, + {"Backspace key", 986}, + {"End key", 987}, + {"Up arrow key", 988}, + {"Down arrow key", 989}, + {"Left arrow key", 990}, + {"Right arrow key", 991}, + {"Home key", 992}, + {"Page Down key", 993}, + {"Page Up key", 994}, + {"Insert key", 995}, + {"Delete key", 996}, + {"Completion/M-tab", 997}, + {"+ on keypad", 998}, + {"- on keypad", 999}, + {"* on keypad", 1000}, + {"Left arrow keypad", 1001}, + {"Right arrow keypad", 1002}, + {"Up arrow keypad", 1003}, + {"Down arrow keypad", 1004}, + {"Home on keypad", 1005}, + {"End on keypad", 1006}, + {"Page Down keypad", 1007}, + {"Page Up keypad", 1008}, + {"Insert on keypad", 1009}, + {"Delete on keypad", 1010}, + {"Enter on keypad", 1011}, + {"Slash on keypad", 1012}, + {"NumLock on keypad", 1013}, + {"Password:", 1014}, + {"Password", 1015}, + {"Ok", 1016}, {"\ Couldn't open %s archive\n\ -%s", 1010}, - {"Inconsistent extfs archive", 1011}, - {"Sorry, we can not do password authenticated connections for now.", 1012}, - {" Could not set source routing (%s)", 1013}, +%s", 1017}, + {"Inconsistent extfs archive", 1018}, + {"Sorry, we can not do password authenticated connections for now.", 1019}, + {" Could not set source routing (%s)", 1020}, {"\ ~/.netrc file has not correct mode.\n\ -Remove password or correct mode.", 1014}, - {" MCFS ", 1015}, - {" The server does not support this version ", 1016}, +Remove password or correct mode.", 1021}, + {" MCFS ", 1022}, + {" The server does not support this version ", 1023}, {"\ The remote server is not running on a system port \n\ you need a password to log in, but the information may \n\ - not be safe on the remote side. Continue? \n", 1017}, - {" Yes ", 1018}, - {" No ", 1019}, - {" The remote server is running on strange port. Giving up.\n", 1020}, - {" MCFS Password required ", 1021}, - {" Invalid password ", 1022}, - {" Too many open connections ", 1023}, + not be safe on the remote side. Continue? \n", 1024}, + {" Yes ", 1025}, + {" No ", 1026}, + {" The remote server is running on strange port. Giving up.\n", 1027}, + {" MCFS Password required ", 1028}, + {" Invalid password ", 1029}, + {" Too many open connections ", 1030}, {"\ Couldn't open tar archive\n\ -%s", 1024}, - {"Unexpected EOF on archive file", 1025}, - {"Inconsistent tar archive", 1026}, +%s", 1031}, + {"Unexpected EOF on archive file", 1032}, + {"Inconsistent tar archive", 1033}, {"\ Hmm,...\n\ %s\n\ -doesn't look like a tar archive.", 1027}, +doesn't look like a tar archive.", 1034}, }; -int _msg_tbl_length = 1027; +int _msg_tbl_length = 1034; diff -ruN old/mc-4.5.13/po/mc.pot new/mc-4.5.14/po/mc.pot --- old/mc-4.5.13/po/mc.pot Wed Feb 10 19:41:22 1999 +++ new/mc-4.5.14/po/mc.pot Thu Feb 11 21:44:27 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-10 18:27-0600\n" +"POT-Creation-Date: 1999-02-11 20:35-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -153,7 +153,7 @@ msgstr "" #: gnome/gcmd.c:578 gnome/gcmd.c:619 gnome/gcmd.c:624 gnome/gcmd.c:628 -#: gnome/gscreen.c:2570 +#: gnome/gscreen.c:2512 msgid "Show all files" msgstr "" @@ -181,7 +181,7 @@ msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:350 gnome/gdesktop.c:1566 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1534 msgid "Warning" msgstr "" @@ -190,16 +190,16 @@ msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1532 +#: gnome/gdesktop.c:1500 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1562 +#: gnome/gdesktop.c:1530 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:1567 +#: gnome/gdesktop.c:1535 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -545,51 +545,51 @@ msgid "File/New/Directory..." msgstr "" -#: gnome/gpopup.c:222 gnome/gpopup.c:223 +#: gnome/gpopup.c:226 gnome/gpopup.c:227 msgid "Properties" msgstr "" -#: gnome/gpopup.c:225 gnome/gpopup.c:226 +#: gnome/gpopup.c:229 gnome/gpopup.c:230 msgid "Open" msgstr "" -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:231 msgid "Open with" msgstr "" -#: gnome/gpopup.c:228 src/screen.c:2287 src/screen.c:2317 +#: gnome/gpopup.c:232 src/screen.c:2287 src/screen.c:2317 msgid "View" msgstr "" -#: gnome/gpopup.c:229 +#: gnome/gpopup.c:233 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:230 src/screen.c:2288 src/screen.c:2318 src/view.c:1996 +#: gnome/gpopup.c:234 src/screen.c:2288 src/screen.c:2318 src/view.c:1996 msgid "Edit" msgstr "" -#: gnome/gpopup.c:232 +#: gnome/gpopup.c:236 msgid "Link..." msgstr "" -#: gnome/gpopup.c:233 +#: gnome/gpopup.c:237 msgid "Symlink..." msgstr "" -#: gnome/gpopup.c:234 +#: gnome/gpopup.c:238 msgid "Edit symlink..." msgstr "" -#: gnome/gpopup.c:241 gnome/gpopup.c:252 +#: gnome/gpopup.c:245 gnome/gpopup.c:256 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:242 gnome/gpopup.c:253 +#: gnome/gpopup.c:246 gnome/gpopup.c:257 msgid "Copy..." msgstr "" -#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:247 gnome/gpopup.c:259 gtkedit/editwidget.c:1067 #: src/screen.c:2292 src/screen.c:2322 msgid "Delete" msgstr "" @@ -763,7 +763,7 @@ msgid "Title" msgstr "" -#: gnome/gprop.c:521 gnome/gscreen.c:2340 +#: gnome/gprop.c:521 gnome/gscreen.c:2305 msgid "Icon" msgstr "" @@ -771,164 +771,164 @@ msgid "Select icon" msgstr "" -#: gnome/gscreen.c:1612 +#: gnome/gscreen.c:1577 msgid "All files" msgstr "" -#: gnome/gscreen.c:1614 +#: gnome/gscreen.c:1579 msgid "Archives and compressed files" msgstr "" -#: gnome/gscreen.c:1616 +#: gnome/gscreen.c:1581 msgid "RPM/DEB files" msgstr "" -#: gnome/gscreen.c:1618 +#: gnome/gscreen.c:1583 msgid "Text/Document files" msgstr "" -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1585 msgid "HTML and SGML files" msgstr "" -#: gnome/gscreen.c:1622 +#: gnome/gscreen.c:1587 msgid "Postscript and PDF files" msgstr "" -#: gnome/gscreen.c:1624 +#: gnome/gscreen.c:1589 msgid "Spreadsheet files" msgstr "" -#: gnome/gscreen.c:1626 +#: gnome/gscreen.c:1591 msgid "Image files" msgstr "" -#: gnome/gscreen.c:1629 +#: gnome/gscreen.c:1594 msgid "Video/animation files" msgstr "" -#: gnome/gscreen.c:1631 +#: gnome/gscreen.c:1596 msgid "Audio files" msgstr "" -#: gnome/gscreen.c:1633 +#: gnome/gscreen.c:1598 msgid "C program files" msgstr "" -#: gnome/gscreen.c:1635 +#: gnome/gscreen.c:1600 msgid "C++ program files" msgstr "" -#: gnome/gscreen.c:1637 +#: gnome/gscreen.c:1602 msgid "Objective-C program files" msgstr "" -#: gnome/gscreen.c:1639 +#: gnome/gscreen.c:1604 msgid "Scheme program files" msgstr "" -#: gnome/gscreen.c:1641 +#: gnome/gscreen.c:1606 msgid "Assembler program files" msgstr "" -#: gnome/gscreen.c:1643 +#: gnome/gscreen.c:1608 msgid "Misc. program files" msgstr "" -#: gnome/gscreen.c:1645 +#: gnome/gscreen.c:1610 msgid "Font files" msgstr "" -#: gnome/gscreen.c:1772 +#: gnome/gscreen.c:1737 #, c-format msgid "Search: %s" msgstr "" -#: gnome/gscreen.c:1782 +#: gnome/gscreen.c:1747 #, c-format msgid "%s bytes in %d file" msgstr "" -#: gnome/gscreen.c:1782 +#: gnome/gscreen.c:1747 #, c-format msgid "%s bytes in %d files" msgstr "" -#: gnome/gscreen.c:1808 src/screen.c:677 +#: gnome/gscreen.c:1773 src/screen.c:677 msgid "" msgstr "" -#: gnome/gscreen.c:1862 +#: gnome/gscreen.c:1827 msgid "Filter" msgstr "" -#: gnome/gscreen.c:2340 +#: gnome/gscreen.c:2305 msgid "Switch view to an Icon view" msgstr "" -#: gnome/gscreen.c:2342 +#: gnome/gscreen.c:2307 msgid "Brief" msgstr "" -#: gnome/gscreen.c:2342 +#: gnome/gscreen.c:2307 msgid "Switch view to show just file name and type" msgstr "" -#: gnome/gscreen.c:2344 +#: gnome/gscreen.c:2309 msgid "Detailed" msgstr "" -#: gnome/gscreen.c:2344 +#: gnome/gscreen.c:2309 msgid "Switch view to show detailed file statistics" msgstr "" -#: gnome/gscreen.c:2346 +#: gnome/gscreen.c:2311 msgid "Custom" msgstr "" -#: gnome/gscreen.c:2346 +#: gnome/gscreen.c:2311 msgid "Switch view to show custom determined statistics." msgstr "" -#: gnome/gscreen.c:2351 +#: gnome/gscreen.c:2316 msgid "Back" msgstr "" -#: gnome/gscreen.c:2351 +#: gnome/gscreen.c:2316 msgid "Go to the previously visited directory" msgstr "" -#: gnome/gscreen.c:2353 +#: gnome/gscreen.c:2318 msgid "Up" msgstr "" -#: gnome/gscreen.c:2353 +#: gnome/gscreen.c:2318 msgid "Go up a level in the directory heirarchy" msgstr "" -#: gnome/gscreen.c:2355 +#: gnome/gscreen.c:2320 msgid "Forward" msgstr "" -#: gnome/gscreen.c:2355 +#: gnome/gscreen.c:2320 msgid "Go to the next directory" msgstr "" -#: gnome/gscreen.c:2358 +#: gnome/gscreen.c:2323 msgid "Home" msgstr "" -#: gnome/gscreen.c:2358 +#: gnome/gscreen.c:2323 msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2515 +#: gnome/gscreen.c:2457 msgid "Location:" msgstr "" #: gnome/gtools.c:104 src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 #: src/boxes.c:466 src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 -#: src/boxes.c:894 src/filegui.c:807 src/find.c:151 src/layout.c:369 +#: src/boxes.c:894 src/filegui.c:807 src/find.c:171 src/layout.c:369 #: src/option.c:144 src/wtools.c:289 src/wtools.c:561 msgid "&Ok" msgstr "" @@ -1538,7 +1538,7 @@ #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 #: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:790 -#: src/find.c:151 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 +#: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:370 src/learn.c:59 src/option.c:145 src/panelize.c:86 #: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:559 #: src/wtools.c:640 @@ -1778,7 +1778,7 @@ msgid "Running " msgstr "" -#: src/boxes.c:833 src/find.c:671 +#: src/boxes.c:833 src/find.c:716 src/find.c:957 msgid "Stopped" msgstr "" @@ -2855,86 +2855,115 @@ " %s " msgstr "" -#: src/find.c:115 +#: src/find.c:130 msgid "&Suspend" msgstr "" -#: src/find.c:116 +#: src/find.c:131 msgid "Con&tinue" msgstr "" -#: src/find.c:117 +#: src/find.c:132 msgid "&Chdir" msgstr "" -#: src/find.c:118 +#: src/find.c:133 msgid "&Again" msgstr "" -#: src/find.c:119 +#: src/find.c:134 msgid "&Quit" msgstr "" -#: src/find.c:120 src/panelize.c:89 +#: src/find.c:135 src/panelize.c:89 msgid "Pane&lize" msgstr "" -#: src/find.c:121 +#: src/find.c:136 msgid "&View - F3" msgstr "" -#: src/find.c:122 +#: src/find.c:137 msgid "&Edit - F4" msgstr "" -#: src/find.c:150 +#: src/find.c:170 msgid "Start at:" msgstr "" -#: src/find.c:150 +#: src/find.c:170 msgid "Filename:" msgstr "" -#: src/find.c:150 +#: src/find.c:170 msgid "Content: " msgstr "" -#: src/find.c:151 src/main.c:1199 src/main.c:1220 +#: src/find.c:171 src/main.c:1199 src/main.c:1220 msgid "&Tree" msgstr "" -#: src/find.c:203 +#: src/find.c:223 msgid "Find File" msgstr "" -#: src/find.c:430 +#: src/find.c:452 #, c-format msgid "Grepping in %s" msgstr "" -#: src/find.c:468 +#: src/find.c:490 msgid " Find/read " msgstr "" -#: src/find.c:468 +#: src/find.c:490 msgid " Problem reading from child " msgstr "" -#: src/find.c:515 +#: src/find.c:537 msgid "Finished" msgstr "" -#: src/find.c:539 src/view.c:1465 +#: src/find.c:561 src/view.c:1465 #, c-format msgid "Searching %s" msgstr "" -#: src/find.c:671 src/find.c:788 +#: src/find.c:714 src/find.c:754 +msgid "Suspend" +msgstr "" + +#: src/find.c:714 +msgid "Restart" +msgstr "" + +#: src/find.c:716 src/find.c:818 src/find.c:957 src/find.c:1053 msgid "Searching" msgstr "" -#: src/find.c:763 +#: src/find.c:747 src/find.c:1028 msgid "Find file" +msgstr "" + +#. The buttons +#: src/find.c:752 +msgid "Change to this directory" +msgstr "" + +#: src/find.c:753 +msgid "Search again" +msgstr "" + +#: src/find.c:758 +msgid "View this file" +msgstr "" + +#: src/find.c:759 +msgid "Edit this file" +msgstr "" + +#: src/find.c:760 +msgid "Send the results to a Panel" msgstr "" #: src/fixhlp.c:171 diff -ruN old/mc-4.5.13/src/ChangeLog new/mc-4.5.14/src/ChangeLog --- old/mc-4.5.13/src/ChangeLog Wed Feb 10 19:41:17 1999 +++ new/mc-4.5.14/src/ChangeLog Thu Feb 11 21:44:24 1999 @@ -1,3 +1,7 @@ +1999-02-11 Federico Mena Quintero + + * panel.h (WPanel): Removed unused field "corbadat". + 1999-02-10 Miguel de Icaza * screen.c: Make delete key delete files. diff -ruN old/mc-4.5.13/src/find.c new/mc-4.5.14/src/find.c --- old/mc-4.5.13/src/find.c Wed Feb 10 19:41:15 1999 +++ new/mc-4.5.14/src/find.c Thu Feb 11 21:44:24 1999 @@ -80,14 +80,10 @@ /* A list of directories to be ignores, separated with ':' */ char *find_ignore_dirs = 0; -static Dlg_head *find_dlg; /* The dialog */ static WInput *in_start; /* Start path */ static WInput *in_name; /* Pattern to search */ static WInput *in_with; /* text inside filename */ -static WListbox *find_list; /* Listbox with the file list */ static int running = 0; /* nice flag */ -static WButton *stop_button; /* pointer to the stop button */ -static WLabel *status_label; /* Finished, Searching etc. */ static char *find_pattern; /* Pattern to search */ static char *content_pattern; /* pattern to search inside files */ static int count; /* Number of files displayed */ @@ -96,6 +92,25 @@ int max_loops_in_idle = 10; static char *old_dir; +static Dlg_head *find_dlg; /* The dialog */ + +#ifdef HAVE_GNOME +static GtkWidget *g_find_dlg; +static GtkWidget *g_status_label; +static GtkWidget *g_clist; +static GtkWidget *g_start_stop; +static GtkWidget *g_start_stop_label; +static GtkWidget *g_view, *g_edit; +static GtkWidget *g_panelize; +static int current_row; +static int idle_tag; +static int stop; +#else +static WButton *stop_button; /* pointer to the stop button */ +static WLabel *status_label; /* Finished, Searching etc. */ +static WListbox *find_list; /* Listbox with the file list */ +#endif + /* For nice updating */ static char *rotating_dash = "|/-\\"; @@ -122,6 +137,11 @@ { N_("&Edit - F4"), 13, 38 } }; +static char *add_to_list (char *text, void *closure); +static void stop_idle (void *data); +static void status_update (char *text); +static void get_list_info (char **file, char **dir); + /* * find_parameters: gets information from the user * @@ -321,15 +341,15 @@ if (strcmp (old_dir, dir)){ g_free (old_dir); old_dir = g_strdup (dir); - dirname = listbox_add_item (find_list, 0, 0, dir, 0); + dirname = add_to_list (dir, NULL); } } else { old_dir = g_strdup (dir); - dirname = listbox_add_item (find_list, 0, 0, dir, 0); + dirname = add_to_list (dir, NULL); } tmp_name = g_strconcat (" ", file, NULL); - listbox_add_item (find_list, 0, 0, tmp_name, dirname); + add_to_list (tmp_name, dirname); g_free (tmp_name); } @@ -339,12 +359,14 @@ int p = ++matches & 7; insert_file (dir, file); - + +#ifndef HAVE_GNOME /* Scroll nicely */ if (!p) listbox_select_last (find_list, 1); else listbox_select_last (find_list, 0); +#endif #ifndef HAVE_X /* Updates the current listing */ @@ -429,7 +451,7 @@ g_snprintf (buffer, sizeof (buffer), _("Grepping in %s"), name_trunc (filename, FIND2_X_USE)); - label_set_text (status_label, buffer); + status_update (buffer); mc_refresh (); p = buffer; ignoring = 0; @@ -471,7 +493,7 @@ mc_close (file_fd); } -static void +static int do_search (struct Dlg_head *h) { static struct dirent *dp = 0; @@ -490,7 +512,7 @@ dirp = 0; } dp = 0; - return; + return 1; } #ifndef HAVE_X do_search_begin: @@ -512,9 +534,9 @@ tmp = pop_directory (); if (!tmp){ running = 0; - label_set_text (status_label, _("Finished")); - set_idle_proc (h, 0); - return; + status_update (_("Finished")); + stop_idle (h); + return 0; } if (find_ignore_dirs){ int found; @@ -537,7 +559,7 @@ char buffer [BUF_SMALL]; g_snprintf (buffer, sizeof (buffer), _("Searching %s"), name_trunc (directory, FIND2_X_USE)); - label_set_text (status_label, buffer); + status_update (buffer); } dirp = mc_opendir (directory); mc_stat (directory, &tmp_stat); @@ -553,7 +575,7 @@ if (strcmp (dp->d_name, ".") == 0 || strcmp (dp->d_name, "..") == 0){ dp = mc_readdir (dirp); - return; + return 1; } tmp_name = concat_dir_and_file (directory, dp->d_name); @@ -594,28 +616,37 @@ } #endif x_flush_events (); + return 1; } -static int -view_edit_currently_selected_file (int unparsed_view, int edit) +static void +init_find_vars (void) { - WLEntry *entry = find_list->current; - char *dir, *fullname, *filename; - int line; - - if (!entry) - return MSG_NOT_HANDLED; - - dir = entry->data; + char *dir; + + if (old_dir){ + g_free (old_dir); + old_dir = 0; + } + count = 0; + matches = 0; - if (!entry->text || !dir) - return MSG_NOT_HANDLED; + /* Remove all the items in the stack */ + while ((dir = pop_directory ()) != NULL) + g_free (dir); +} +static void +find_do_view_edit (int unparsed_view, int edit, char *dir, char *file) +{ + char *fullname, *filename; + int line; + if (content_pattern){ - filename = strchr (entry->text + 4, ':') + 1; - line = atoi (entry->text + 4); + filename = strchr (file + 4, ':') + 1; + line = atoi (file + 4); } else { - filename = entry->text + 4; + filename = file + 4; line = 0; } if (dir [0] == '.' && dir [1] == 0) @@ -630,6 +661,261 @@ else view_file_at_line (fullname, unparsed_view, use_internal_view, line); g_free (fullname); +} + +#ifdef HAVE_GNOME +static void +select_row (GtkCList *clist, gint row, gint column, GdkEvent *event) +{ + gtk_widget_set_sensitive (g_edit, TRUE); + gtk_widget_set_sensitive (g_view, TRUE); + current_row = row; +} + +static void +find_do_chdir (void) +{ + gtk_idle_remove (idle_tag); + idle_tag = 0; + stop = B_ENTER; + gtk_main_quit (); +} + +static void +find_do_again (void) +{ + gtk_idle_remove (idle_tag); + idle_tag = 0; + stop = B_AGAIN; + gtk_main_quit (); +} + +static void +find_do_panelize (void) +{ + gtk_idle_remove (idle_tag); + idle_tag = 0; + stop = B_PANELIZE; + gtk_main_quit ();} + + +static void +find_start_stop (void) +{ + + if (is_start){ + idle_tag = gtk_idle_add ((GtkFunction)do_search, g_find_dlg); + } else { + gtk_idle_remove (idle_tag); + idle_tag = 0; + } + + gtk_label_set_text (GTK_LABEL (g_start_stop_label), + is_start ? _("Suspend") : _("Restart")); + is_start = !is_start; + status_update (is_start ? _("Stopped") : _("Searching")); +} + + +static void +find_do_view (void) +{ + char *file, *dir; + + get_list_info (&file, &dir); + + find_do_view_edit (0, 0, dir, file); +} + +static void +find_do_edit (void) +{ + char *file, *dir; + + get_list_info (&file, &dir); + + find_do_view_edit (0, 1, dir, file); +} + +static void +setup_gui (void) +{ + GtkWidget *sw, *b1, *b2, *b3; + GtkWidget *box, *box2; + + g_find_dlg = gnome_dialog_new ( + _("Find file"), + GNOME_STOCK_BUTTON_OK, + NULL); + + /* The buttons */ + b1 = gtk_button_new_with_label (_("Change to this directory")); + b2 = gtk_button_new_with_label (_("Search again")); + g_start_stop_label = gtk_label_new (_("Suspend")); + g_start_stop = gtk_button_new (); + gtk_container_add (GTK_CONTAINER (g_start_stop), g_start_stop_label); + + g_view = gtk_button_new_with_label (_("View this file")); + g_edit = gtk_button_new_with_label (_("Edit this file")); + g_panelize = gtk_button_new_with_label (_("Send the results to a Panel")); + + box = gtk_hbox_new (TRUE, GNOME_PAD); + gtk_box_pack_start (GTK_BOX (box), b1, 0, 1, 0); + gtk_box_pack_start (GTK_BOX (box), b2, 0, 1, 0); + gtk_box_pack_start (GTK_BOX (box), g_start_stop, 0, 1, 0); + +/* RECOONECT _("Panelize contents"), */ +/* _("View"), + _("Edit"), */ + + sw = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + g_clist = gtk_clist_new (1); + gtk_clist_set_selection_mode (GTK_CLIST (g_clist), GTK_SELECTION_SINGLE); + gtk_widget_set_usize (g_clist, -1, 200); + gtk_container_add (GTK_CONTAINER (sw), g_clist); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (g_find_dlg)->vbox), + sw, TRUE, TRUE, GNOME_PAD_SMALL); + + current_row = -1; + stop = 0; + gtk_signal_connect (GTK_OBJECT (g_clist), "select_row", + GTK_SIGNAL_FUNC (select_row), NULL); + + /* + * Connect the buttons + */ + gtk_signal_connect ( + GTK_OBJECT (b1), "clicked", GTK_SIGNAL_FUNC (find_do_chdir), NULL); + gtk_signal_connect ( + GTK_OBJECT (b2), "clicked", GTK_SIGNAL_FUNC (find_do_again), NULL); + gtk_signal_connect ( + GTK_OBJECT (g_start_stop), "clicked", GTK_SIGNAL_FUNC (find_start_stop), NULL); + gtk_signal_connect ( + GTK_OBJECT (g_panelize), "clicked", GTK_SIGNAL_FUNC (find_do_panelize), NULL); + + /* + * View/edit buttons + */ + gtk_signal_connect ( + GTK_OBJECT (g_view), "clicked", GTK_SIGNAL_FUNC (find_do_view), NULL); + gtk_signal_connect ( + GTK_OBJECT (g_edit), "clicked", GTK_SIGNAL_FUNC (find_do_edit), NULL); + + gtk_widget_set_sensitive (g_view, FALSE); + gtk_widget_set_sensitive (g_edit, FALSE); + box2 = gtk_hbox_new (1, GNOME_PAD + GNOME_PAD); + gtk_box_pack_start (GTK_BOX (box2), g_view, 0, 0, 0); + gtk_box_pack_start (GTK_BOX (box2), g_edit, 0, 0, 0); + + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (g_find_dlg)->vbox), + box, TRUE, TRUE, GNOME_PAD_SMALL); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (g_find_dlg)->vbox), + box2, TRUE, TRUE, GNOME_PAD_SMALL); + + g_status_label = gtk_label_new (_("Searching")); + gtk_misc_set_alignment (GTK_MISC (g_status_label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (g_find_dlg)->vbox), + g_status_label, TRUE, TRUE, GNOME_PAD_SMALL); + + gtk_widget_show_all (g_find_dlg); + gtk_widget_hide (find_do_view); + gtk_widget_hide (find_do_edit); +} + +static int +run_process () +{ + idle_tag = gtk_idle_add ((GtkFunction)do_search, g_find_dlg); + + gnome_dialog_run (GNOME_DIALOG (g_find_dlg)); + g_start_stop = NULL; + + return stop; +} + +static void +kill_gui () +{ + gtk_object_destroy (GTK_OBJECT (g_find_dlg)); +} + +static void +stop_idle (void *data) +{ + if (g_start_stop) + gtk_widget_set_sensitive (GTK_WIDGET (g_start_stop), FALSE); +} + +static void +status_update (char *text) +{ + gtk_label_set_text (GTK_LABEL (g_status_label), text); + x_flush_events (); +} + +static char * +add_to_list (char *text, void *data) +{ + int row; + char *texts [1]; + + texts [0] = text; + + row = gtk_clist_append (GTK_CLIST (g_clist), texts); + gtk_clist_set_row_data (GTK_CLIST (g_clist), row, data); +#if 1 + if (gtk_clist_row_is_visible (GTK_CLIST (g_clist), row) != GTK_VISIBILITY_FULL) + gtk_clist_moveto (GTK_CLIST (g_clist), row, 0, 0.5, 0.0); +#endif + return text; +} + +static void +get_list_info (char **file, char **dir) +{ + if (current_row == -1) + *file = *dir = NULL; + gtk_clist_get_text (GTK_CLIST (g_clist), current_row, 0, file); + *dir = gtk_clist_get_row_data (GTK_CLIST (g_clist), current_row); +} +#else + +static void +get_list_info (char **file, char **dir) +{ + listbox_get_current (find_list, file, dir); +} + +static char * +add_to_list (char *text, void *data) +{ + return listbox_add_item (find_list, 0, 0, text, 0); +} + +static void +stop_idle (void *data) +{ + set_idle_proc (data, 0); +} + +static int +view_edit_currently_selected_file (int unparsed_view, int edit) +{ + WLEntry *entry = find_list->current; + char *dir; + + if (!entry) + return MSG_NOT_HANDLED; + + dir = entry->data; + + if (!entry->text || !dir) + return MSG_NOT_HANDLED; + + find_do_view_edit (unparsed_view, edit, dir, entry->text); return MSG_HANDLED; } @@ -668,7 +954,7 @@ set_idle_proc (find_dlg, running); is_start = !is_start; - label_set_text (status_label, is_start ? _("Stopped") : _("Searching")); + status_update (is_start ? _("Stopped") : _("Searching")); button_set_text (stop_button, fbuts [is_start].text); return 0; @@ -691,29 +977,8 @@ } static void -init_find_vars (void) -{ - char *dir; - - if (old_dir){ - g_free (old_dir); - old_dir = 0; - } - count = 0; - matches = 0; - - /* Remove all the items in the stack */ - while ((dir = pop_directory ()) != NULL) - g_free (dir); -} - -static int -find_file (char *start_dir, char *pattern, char *content, char **dirname, char **filename) +setup_gui (void) { - int return_value = 0; - char *dir; - char *dir_tmp, *file_tmp; - #ifdef ENABLE_NLS static int i18n_flag = 0; if (!i18n_flag) @@ -790,29 +1055,60 @@ find_list = listbox_new (2, 2, FIND2_X-4, FIND2_Y-9, listbox_finish, 0, "listbox"); add_widgetl (find_dlg, find_list, XV_WLAY_EXTENDWIDTH); +} + +static int +run_process (void) +{ + set_idle_proc (find_dlg, 1); + run_dlg (find_dlg); + return find_dlg->ret_value; +} +static void +status_update (char *text) +{ + label_set_text (status_label, text); +} + +static void +kill_gui (void) +{ + set_idle_proc (find_dlg, 0); + destroy_dlg (find_dlg); +} +#endif + +static int +find_file (char *start_dir, char *pattern, char *content, char **dirname, char **filename) +{ + int return_value = 0; + char *dir; + char *dir_tmp, *file_tmp; + + setup_gui (); + /* FIXME: Need to cleanup this, this ought to be passed non-globaly */ find_pattern = pattern; content_pattern = content; - set_idle_proc (find_dlg, 1); init_find_vars (); push_directory (start_dir); - run_dlg (find_dlg); - - return_value = find_dlg->ret_value; + return_value = run_process (); /* Remove all the items in the stack */ while ((dir = pop_directory ()) != NULL) g_free (dir); - - listbox_get_current (find_list, &file_tmp, &dir_tmp); + + get_list_info (&file_tmp, &dir_tmp); if (dir_tmp) *dirname = g_strdup (dir_tmp); if (file_tmp) *filename = g_strdup (file_tmp); + +#ifndef HAVE_GNOME if (return_value == B_PANELIZE && *filename){ int status, link_to_dir, stalled_link; int next_free = 0; @@ -886,9 +1182,9 @@ } } } +#endif - set_idle_proc (find_dlg, 0); - destroy_dlg (find_dlg); + kill_gui (); do_search (0); /* force do_search to release resources */ if (old_dir){ g_free (old_dir); diff -ruN old/mc-4.5.13/src/panel.h new/mc-4.5.14/src/panel.h --- old/mc-4.5.13/src/panel.h Wed Feb 10 19:41:14 1999 +++ new/mc-4.5.14/src/panel.h Thu Feb 11 21:44:24 1999 @@ -139,11 +139,6 @@ void *ministatus; void *tree_scrolled_window; -#ifdef NEW_GNOME_LIBS -#else - void *scrollbar; -#endif - void *filter_w; /* A WInput* */ void *current_dir; /* A WInput* */ int estimated_total; @@ -164,7 +159,6 @@ int drag_motion_y; void *panel_listbox; /* container for the list */ #endif - void *corbadat; } WPanel; WPanel *panel_new (char *panel_name);