Removed 'httpcaptive' redirection hack.

 - No longer needed as the current GnomeVFS uses seek()able libneon.

diff --git a/src/install/acquire/cabinet.c b/src/install/acquire/cabinet.c
index a748492..66d397c 100644 (file)
--- a/src/install/acquire/cabinet.c
+++ b/src/install/acquire/cabinet.c
@@ -102,7 +102,7 @@ static void handler_SIGALRM(int signo)
 /* FIXME: This is hack.
  * Correct way would be to use 'GnomeVFSCancellation'
  * to abort 'GnomeVFSInetConnection' acting as 'GnomeVFSSocket'.
- * This abort should be handled from 'http'/'httpcaptive' handler
+ * This abort should be handled from 'http' handler
  * but gnome_vfs_cancellation_cancel() cannot be invoked from
  * the asynchronous slave thread.
  */
@@ -322,33 +322,7 @@ struct acquire_cabinet *r;
        r->cabinet_done=0;
        r->cabinet_used=cabinet_used;
 
-       /* Replace 'http://' by 'httpcaptive://' if system 'http' does not support seek(). */
-       gnome_vfs_uri_ref(uri);
-       if (GNOME_VFS_ERROR_NOT_SUPPORTED==gnome_vfs_seek(
-                       *handlep,       /* handle */
-                       GNOME_VFS_SEEK_START,   /* whence */
-                       0)) {   /* offset */
-gchar *href;
-const gchar *href2;
-GnomeVFSURI *uri2;
-
-               href=gnome_vfs_uri_to_string(uri,GNOME_VFS_URI_HIDE_NONE);
-               if (strncmp(href,"http://",strlen("http://"))) {
-                       g_warning(_("Destination file URL not valid: %s"),href);
-                       goto href_done;
-                       }
-               href2=captive_printf_alloca("httpcaptive://%s",href+strlen("http://"));
-               if (!(uri2=gnome_vfs_uri_new(href2))) {
-                       g_warning(_("'httpcaptive' GnomeVFS method not supported; install package 'gnomevfs-httpcaptive'; URL: %s"),href2);
-                       goto href_done;
-                       }
-               gnome_vfs_uri_unref(uri);
-               uri=uri2;
-href_done:;
-               }
-
        acquire_cabinet_set_uri(r,uri);
-       gnome_vfs_uri_unref(uri);
        r->memory=acquire_cabinet_memory_object_new();
 
        return r;

diff --git a/src/install/acquire/ui-line.c b/src/install/acquire/ui-line.c
index 4426409..fa7a988 100644 (file)
--- a/src/install/acquire/ui-line.c
+++ b/src/install/acquire/ui-line.c
@@ -263,9 +263,7 @@ char *line;
                                if (line && *line) {
 GnomeVFSURI *uri;
 
-                                       uri=gnome_vfs_uri_new((strncmp(line,"http://",strlen("http://")) ? line
-                                                       : captive_printf_alloca("httpcaptive://%s",line+strlen("http://"))));
-                                       if (!uri)
+                                       if (!(uri=gnome_vfs_uri_new(line)))
                                                printf(_("Error paring URI: %s"),line);
                                        else {
                                                mod_uri_load_base_reporting(uri);