Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / src / install / acquire / microsoftcom.c

diff --git a/src/install/acquire/microsoftcom.c b/src/install/acquire/microsoftcom.c
index 6459c6a..3b41a9d 100644 (file)
--- a/src/install/acquire/microsoftcom.c
+++ b/src/install/acquire/microsoftcom.c
@@ -37,9 +37,9 @@
  * implement custom Gnome-VFS http timeouts as 'ACQUIRE_CABINET_READ_RAW_READ_TIMEOUT'.
  */
 #if 0
-#define MICROSOFTCOM_URL "http://www.microsoft.com/WindowsXP/pro/downloads/servicepacks/sp1/checkedbuild.asp"
+#define MICROSOFTCOM_URL "http://www.microsoft.com/downloads/details.aspx?familyid=7a4d8d12-9f5d-42bb-b31c-7b31657c869c"
 #else
-#define MICROSOFTDOWNLOAD_URL "http://download.microsoft.com/download/9/7/6/9763833d-bd58-41e2-9911-50f64c7252a3/xpsp1a_en_x86_CHK.exe"
+#define MICROSOFTDOWNLOAD_URL "http://download.microsoft.com/download/e/c/6/ec6e00ab-ec05-4673-b8db-0658cf65f043/WindowsXP-KB835935-SP2-DEBUG-ENU.exe"
 #endif
 
 
@@ -50,7 +50,6 @@ int base_size;
 char *base_contents,*href_end;
 #endif
 char *href;
-const char *href2;
 GnomeVFSURI *uri;
 
 #ifdef MICROSOFTCOM_URL
@@ -69,13 +68,8 @@ GnomeVFSURI *uri;
 #else
        href=MICROSOFTDOWNLOAD_URL;
 #endif
-       if (strncmp(href,"http://",strlen("http://"))) {
-               g_warning(_("Destination file URL not valid: %s"),href);
-               goto fail_free_base_contents;
-               }
-       href2=captive_printf_alloca("httpcaptive://%s",href+strlen("http://"));
-       if (!(uri=gnome_vfs_uri_new(href2))) {
-               g_warning(_("Found destination file URL not parsable: %s"),href2);
+       if (!(uri=gnome_vfs_uri_new(href))) {
+               g_warning(_("Found destination file URL not parsable: %s"),href);
                goto fail_free_base_contents;
                }
 #ifdef MICROSOFTCOM_URL