recursive downloads

6 files changed, 80 insertions, 64 deletions

diff --git a/INSTALL b/INSTALL
index 23e5f25d..54caf7c1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,13 @@
-Installation Instructions
-*************************
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -70,9 +67,9 @@ The simplest way to compile this package is:
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -85,7 +82,7 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -102,19 +99,19 @@ for another architecture.
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
+options like `--bindir=PATH' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -125,7 +122,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -140,11 +137,11 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -159,7 +156,7 @@ where SYSTEM can have one of these forms:
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the `--target=TYPE' option to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
@@ -170,9 +167,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +178,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -189,18 +186,14 @@ them in the `configure' command line, using `VAR=value'.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
diff --git a/TODO b/TODO
index 4621c08a..c6013310 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,10 @@
 0.7.1:
 - fix addition of previews for uploads [pre2]
-- enable instant-transitive downloads [pre2]
 - create directory from known file IDs [ medium ] [pre2]
   in Assemble Directory's Files Available/Selected
   + have sortability
   + have multiselection
   + print filenames as well
-- more help-texts (glade) [ easy ] [pre2]
 
 - re-enable advanced/namespace menus [pre3]
   + namespace creation
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index dc28921a..a9f3a39e 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -179,6 +179,7 @@ This release fixes downloads of files from directories.  The previous version ha
             <packing>
               <property name="tab_expand">False</property>
               <property name="tab_fill">True</property>
+              <property name="menu_label" translatable="yes"></property>
             </packing>
           </child>
 
@@ -586,6 +587,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                       <child>
                                         <widget class="GtkButton" id="startDaemonConfWizard">
                                           <property name="visible">True</property>
+                                          <property name="tooltip" translatable="yes">Run gnunet-setup in wizard mode</property>
                                           <property name="can_focus">True</property>
                                           <property name="relief">GTK_RELIEF_NORMAL</property>
                                           <property name="focus_on_click">True</property>
@@ -665,6 +667,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                       <child>
                                         <widget class="GtkButton" id="startDaemonConfTool">
                                           <property name="visible">True</property>
+                                          <property name="tooltip" translatable="yes">Run gnunet-setup in standard configuration mode</property>
                                           <property name="can_focus">True</property>
                                           <property name="relief">GTK_RELIEF_NORMAL</property>
                                           <property name="focus_on_click">True</property>
@@ -1088,6 +1091,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                   <child>
                                     <widget class="GtkButton" id="fs_status_download_button">
                                       <property name="visible">True</property>
+                                      <property name="tooltip" translatable="yes">Download the content specified by the URI</property>
                                       <property name="can_focus">True</property>
                                       <property name="relief">GTK_RELIEF_NORMAL</property>
                                       <property name="focus_on_click">True</property>
@@ -1233,7 +1237,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                 <widget class="GtkButton" id="abortDownloadButton">
                                   <property name="visible">True</property>
                                   <property name="sensitive">False</property>
-                                  <property name="tooltip" translatable="yes">Cancel the selected download</property>
+                                  <property name="tooltip" translatable="yes">Cancel the selected download (and all sub-downloads)</property>
                                   <property name="can_focus">True</property>
                                   <property name="label">gtk-cancel</property>
                                   <property name="use_stock">True</property>
@@ -1252,7 +1256,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                 <widget class="GtkButton" id="stopDownloadButton">
                                   <property name="visible">True</property>
                                   <property name="sensitive">False</property>
-                                  <property name="tooltip" translatable="yes">Cancel the selected download and remove it from the list</property>
+                                  <property name="tooltip" translatable="yes">Cancel the selected download (and all sub-downloads) and remove them from the list</property>
                                   <property name="can_focus">True</property>
                                   <property name="label">gtk-stop</property>
                                   <property name="use_stock">True</property>
@@ -1377,7 +1381,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                 <widget class="GtkButton" id="cancelUploadButton">
                                   <property name="visible">True</property>
                                   <property name="sensitive">False</property>
-                                  <property name="tooltip" translatable="yes">Cancel the selected upload</property>
+                                  <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads)</property>
                                   <property name="can_focus">True</property>
                                   <property name="label">gtk-cancel</property>
                                   <property name="use_stock">True</property>
@@ -1396,7 +1400,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                 <widget class="GtkButton" id="stopUploadButton">
                                   <property name="visible">True</property>
                                   <property name="sensitive">False</property>
-                                  <property name="tooltip" translatable="yes">Cancel the selected upload and remove it from the list</property>
+                                  <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</property>
                                   <property name="can_focus">True</property>
                                   <property name="label">gtk-stop</property>
                                   <property name="use_stock">True</property>
@@ -4509,6 +4513,26 @@ Press ENTER to add the data.</atkproperty>
                   </child>
 
                   <child>
+                    <widget class="GtkCheckButton" id="downloadRecursiveCheckButton">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">If the selected file is a directory, immediately try to download all files in the directory as well.</property>
+                      <property name="can_focus">True</property>
+                      <property name="label" translatable="yes">r_ecursively</property>
+                      <property name="use_underline">True</property>
+                      <property name="relief">GTK_RELIEF_NONE</property>
+                      <property name="focus_on_click">True</property>
+                      <property name="active">False</property>
+                      <property name="inconsistent">False</property>
+                      <property name="draw_indicator">True</property>
+                    </widget>
+                    <packing>
+                      <property name="padding">0</property>
+                      <property name="expand">False</property>
+                      <property name="fill">False</property>
+                    </packing>
+                  </child>
+
+                  <child>
                     <widget class="GtkLabel" id="downloadAnonymityLabel">
                       <property name="visible">True</property>
                       <property name="label" translatable="yes">with anon_ymity</property>
diff --git a/ltmain.sh b/ltmain.sh
index 06823e05..c715b594 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-4"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@ EOF
         case $pass in
         dlopen) libs="$dlfiles" ;;
         dlpreopen) libs="$dlprefiles" ;;
-        link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+        link)
+          libs="$deplibs %DEPLIBS%"
+          test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+          ;;
         esac
       fi
       if test "$pass" = dlopen; then
@@ -3201,6 +3204,11 @@ EOF
             age="$number_minor"
             revision="$number_minor"
             ;;
+          *)
+            $echo "$modename: unknown library version type \`$version_type'" 1>&2
+            $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+            exit $EXIT_FAILURE
+            ;;
           esac
           ;;
         no)
diff --git a/mkinstalldirs b/mkinstalldirs
index 259dbfcd..6fbe5e11 100644
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2005-06-29.22
+scriptversion=2004-02-15.20
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -12,7 +12,7 @@ scriptversion=2005-06-29.22
 # <automake-patches@gnu.org>.
 
 errstatus=0
-dirmode=
+dirmode=""
 
 usage="\
 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -27,7 +27,7 @@ while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
       echo "$usage"
-      exit $?
+      exit 0
       ;;
     -m)                         # -m PERM arg
       shift
@@ -37,7 +37,7 @@ while test $# -gt 0 ; do
       ;;
     --version)
       echo "$0 $scriptversion"
-      exit $?
+      exit 0
       ;;
     --)                         # stop option processing
       shift
@@ -103,21 +103,13 @@ esac
 
 for file
 do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
   shift
-  IFS=$oIFS
 
+  pathcomp=
   for d
   do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
+    pathcomp="$pathcomp$d"
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
@@ -132,7 +124,7 @@ do
       else
         if test ! -z "$dirmode"; then
           echo "chmod $dirmode $pathcomp"
-          lasterr=
+          lasterr=""
           chmod "$dirmode" "$pathcomp" || lasterr=$?
 
           if test ! -z "$lasterr"; then
@@ -142,7 +134,7 @@ do
       fi
     fi
 
-    pathcomp=$pathcomp/
+    pathcomp="$pathcomp/"
   done
 done
 
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index bc9e542a..e5e16ab0 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -616,7 +616,8 @@ initiateDownload(GtkTreeModel * model,
     FSUI_startDownload(ctx,
                        getSpinButtonValue(searchContext->searchXML,
                                           "downloadAnonymitySpinButton"),
-                       NO, /* FIXME: isRecursive */
+                       getToggleButtonValue(searchContext->searchXML,
+                                            "downloadRecursiveCheckButton"),
                        idc_uri,
                        idc_meta,
                        idc_final_download_destination,