From eef907bc2e12174699d5c3f1f67095d72a23ee42 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 19 Feb 2011 13:35:07 +0000 Subject: [PATCH] The Download class now corrects URLs on the fly as well --- po/de.po | 56 ++++++++++++++++++++++++------------------------ po/es.po | 56 ++++++++++++++++++++++++------------------------ po/fr.po | 56 ++++++++++++++++++++++++------------------------ po/it.po | 56 ++++++++++++++++++++++++------------------------ src/common/url.c | 2 +- src/download.c | 9 ++++++-- 6 files changed, 120 insertions(+), 115 deletions(-) diff --git a/po/de.po b/po/de.po index 85ea223..f04fba9 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-19 14:26+0100\n" +"POT-Creation-Date: 2011-02-19 14:34+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:198 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:203 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:488 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:493 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,107 +89,107 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:565 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:570 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" -#: ../src/download.c:175 +#: ../src/download.c:180 msgid "Download" msgstr "" -#: ../src/download.c:185 +#: ../src/download.c:190 msgid "Address: " msgstr "" -#: ../src/download.c:195 +#: ../src/download.c:200 msgid "File: " msgstr "" -#: ../src/download.c:197 +#: ../src/download.c:202 msgid "Status: " msgstr "" -#: ../src/download.c:199 +#: ../src/download.c:204 msgid "Done: " msgstr "" -#: ../src/download.c:200 +#: ../src/download.c:205 msgid "0.0 kB" msgstr "" -#: ../src/download.c:201 +#: ../src/download.c:206 msgid "Speed: " msgstr "" -#: ../src/download.c:202 +#: ../src/download.c:207 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:208 +#: ../src/download.c:213 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:302 ../src/download.c:307 ../src/download.c:642 +#: ../src/download.c:307 ../src/download.c:312 ../src/download.c:647 #: ../src/surfer.c:940 ../src/surfer.c:943 msgid "Error" msgstr "Fehler" -#: ../src/download.c:320 ../src/download.c:346 +#: ../src/download.c:325 ../src/download.c:351 msgid "kB" msgstr "" -#: ../src/download.c:341 ../src/download.c:352 ../src/download.c:371 +#: ../src/download.c:346 ../src/download.c:357 ../src/download.c:376 msgid "MB" msgstr "" -#: ../src/download.c:343 +#: ../src/download.c:348 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:354 +#: ../src/download.c:359 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:373 +#: ../src/download.c:378 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:496 +#: ../src/download.c:501 msgid "Error " msgstr "Fehler " -#: ../src/download.c:521 ../src/download.c:653 +#: ../src/download.c:526 ../src/download.c:658 msgid "Complete" msgstr "" -#: ../src/download.c:529 ../src/download.c:661 +#: ../src/download.c:534 ../src/download.c:666 msgid "Downloading" msgstr "" -#: ../src/download.c:540 +#: ../src/download.c:545 msgid "Redirected to" msgstr "" -#: ../src/download.c:543 +#: ../src/download.c:548 msgid "Redirected" msgstr "" -#: ../src/download.c:550 +#: ../src/download.c:555 msgid "Resolved" msgstr "" -#: ../src/download.c:558 +#: ../src/download.c:563 msgid "Code " msgstr "" -#: ../src/download.c:616 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 +#: ../src/download.c:621 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 msgid "Unknown error" msgstr "" -#: ../src/download.c:682 +#: ../src/download.c:687 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" diff --git a/po/es.po b/po/es.po index a98ef06..e97c731 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-19 14:26+0100\n" +"POT-Creation-Date: 2011-02-19 14:34+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:198 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:203 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:488 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:493 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,107 +89,107 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:565 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:570 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" -#: ../src/download.c:175 +#: ../src/download.c:180 msgid "Download" msgstr "" -#: ../src/download.c:185 +#: ../src/download.c:190 msgid "Address: " msgstr "" -#: ../src/download.c:195 +#: ../src/download.c:200 msgid "File: " msgstr "" -#: ../src/download.c:197 +#: ../src/download.c:202 msgid "Status: " msgstr "" -#: ../src/download.c:199 +#: ../src/download.c:204 msgid "Done: " msgstr "" -#: ../src/download.c:200 +#: ../src/download.c:205 msgid "0.0 kB" msgstr "" -#: ../src/download.c:201 +#: ../src/download.c:206 msgid "Speed: " msgstr "" -#: ../src/download.c:202 +#: ../src/download.c:207 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:208 +#: ../src/download.c:213 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:302 ../src/download.c:307 ../src/download.c:642 +#: ../src/download.c:307 ../src/download.c:312 ../src/download.c:647 #: ../src/surfer.c:940 ../src/surfer.c:943 msgid "Error" msgstr "" -#: ../src/download.c:320 ../src/download.c:346 +#: ../src/download.c:325 ../src/download.c:351 msgid "kB" msgstr "" -#: ../src/download.c:341 ../src/download.c:352 ../src/download.c:371 +#: ../src/download.c:346 ../src/download.c:357 ../src/download.c:376 msgid "MB" msgstr "" -#: ../src/download.c:343 +#: ../src/download.c:348 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:354 +#: ../src/download.c:359 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:373 +#: ../src/download.c:378 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:496 +#: ../src/download.c:501 msgid "Error " msgstr "" -#: ../src/download.c:521 ../src/download.c:653 +#: ../src/download.c:526 ../src/download.c:658 msgid "Complete" msgstr "" -#: ../src/download.c:529 ../src/download.c:661 +#: ../src/download.c:534 ../src/download.c:666 msgid "Downloading" msgstr "" -#: ../src/download.c:540 +#: ../src/download.c:545 msgid "Redirected to" msgstr "" -#: ../src/download.c:543 +#: ../src/download.c:548 msgid "Redirected" msgstr "" -#: ../src/download.c:550 +#: ../src/download.c:555 msgid "Resolved" msgstr "" -#: ../src/download.c:558 +#: ../src/download.c:563 msgid "Code " msgstr "" -#: ../src/download.c:616 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 +#: ../src/download.c:621 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 msgid "Unknown error" msgstr "" -#: ../src/download.c:682 +#: ../src/download.c:687 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" diff --git a/po/fr.po b/po/fr.po index 9e66948..3035df2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-19 14:26+0100\n" +"POT-Creation-Date: 2011-02-19 14:34+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -65,11 +65,11 @@ msgstr "Port :" msgid "Network" msgstr "Réseau" -#: ../src/common/conn.c:204 ../src/download.c:198 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:203 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "Résolution du domaine..." -#: ../src/common/conn.c:253 ../src/download.c:488 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:493 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "Connecté" @@ -91,107 +91,107 @@ msgstr "Hôte inconnu" msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:348 ../src/download.c:565 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:570 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "Délai dépassé" -#: ../src/download.c:175 +#: ../src/download.c:180 msgid "Download" msgstr "Téléchargement" -#: ../src/download.c:185 +#: ../src/download.c:190 msgid "Address: " msgstr "Adresse: " -#: ../src/download.c:195 +#: ../src/download.c:200 msgid "File: " msgstr "Fichier : " -#: ../src/download.c:197 +#: ../src/download.c:202 msgid "Status: " msgstr "Statut : " -#: ../src/download.c:199 +#: ../src/download.c:204 msgid "Done: " msgstr "Fait : " -#: ../src/download.c:200 +#: ../src/download.c:205 msgid "0.0 kB" msgstr "0.0 Kio" -#: ../src/download.c:201 +#: ../src/download.c:206 msgid "Speed: " msgstr "Vitesse : " -#: ../src/download.c:202 +#: ../src/download.c:207 msgid "0.0 kB/s" msgstr "0.0 Kio/s" -#: ../src/download.c:208 +#: ../src/download.c:213 msgid "Close window when the download is complete" msgstr "Fermer la fenêtre à la fin du téléchargement" -#: ../src/download.c:302 ../src/download.c:307 ../src/download.c:642 +#: ../src/download.c:307 ../src/download.c:312 ../src/download.c:647 #: ../src/surfer.c:940 ../src/surfer.c:943 msgid "Error" msgstr "Erreur" -#: ../src/download.c:320 ../src/download.c:346 +#: ../src/download.c:325 ../src/download.c:351 msgid "kB" msgstr "Kio" -#: ../src/download.c:341 ../src/download.c:352 ../src/download.c:371 +#: ../src/download.c:346 ../src/download.c:357 ../src/download.c:376 msgid "MB" msgstr "Mo" -#: ../src/download.c:343 +#: ../src/download.c:348 #, c-format msgid "%.1f %s/s" msgstr "%.1f %s/s" -#: ../src/download.c:354 +#: ../src/download.c:359 #, c-format msgid "%.1f %s" msgstr "%.1f %s/s" -#: ../src/download.c:373 +#: ../src/download.c:378 #, c-format msgid "%.1f of %.1f %s" msgstr "%.1f de %.1f %s" -#: ../src/download.c:496 +#: ../src/download.c:501 msgid "Error " msgstr "Erreur " -#: ../src/download.c:521 ../src/download.c:653 +#: ../src/download.c:526 ../src/download.c:658 msgid "Complete" msgstr "Terminé" -#: ../src/download.c:529 ../src/download.c:661 +#: ../src/download.c:534 ../src/download.c:666 msgid "Downloading" msgstr "Téléchargement" -#: ../src/download.c:540 +#: ../src/download.c:545 msgid "Redirected to" msgstr "Redirigé vers" -#: ../src/download.c:543 +#: ../src/download.c:548 msgid "Redirected" msgstr "Redirigé" -#: ../src/download.c:550 +#: ../src/download.c:555 msgid "Resolved" msgstr "Résolu" -#: ../src/download.c:558 +#: ../src/download.c:563 msgid "Code " msgstr "Code " -#: ../src/download.c:616 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 +#: ../src/download.c:621 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/download.c:682 +#: ../src/download.c:687 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" diff --git a/po/it.po b/po/it.po index 2d4828f..eaa760d 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-19 14:26+0100\n" +"POT-Creation-Date: 2011-02-19 14:34+0100\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:198 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:203 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:488 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:493 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,107 +89,107 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:565 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:570 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" -#: ../src/download.c:175 +#: ../src/download.c:180 msgid "Download" msgstr "" -#: ../src/download.c:185 +#: ../src/download.c:190 msgid "Address: " msgstr "" -#: ../src/download.c:195 +#: ../src/download.c:200 msgid "File: " msgstr "" -#: ../src/download.c:197 +#: ../src/download.c:202 msgid "Status: " msgstr "" -#: ../src/download.c:199 +#: ../src/download.c:204 msgid "Done: " msgstr "" -#: ../src/download.c:200 +#: ../src/download.c:205 msgid "0.0 kB" msgstr "" -#: ../src/download.c:201 +#: ../src/download.c:206 msgid "Speed: " msgstr "" -#: ../src/download.c:202 +#: ../src/download.c:207 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:208 +#: ../src/download.c:213 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:302 ../src/download.c:307 ../src/download.c:642 +#: ../src/download.c:307 ../src/download.c:312 ../src/download.c:647 #: ../src/surfer.c:940 ../src/surfer.c:943 msgid "Error" msgstr "" -#: ../src/download.c:320 ../src/download.c:346 +#: ../src/download.c:325 ../src/download.c:351 msgid "kB" msgstr "" -#: ../src/download.c:341 ../src/download.c:352 ../src/download.c:371 +#: ../src/download.c:346 ../src/download.c:357 ../src/download.c:376 msgid "MB" msgstr "" -#: ../src/download.c:343 +#: ../src/download.c:348 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:354 +#: ../src/download.c:359 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:373 +#: ../src/download.c:378 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:496 +#: ../src/download.c:501 msgid "Error " msgstr "" -#: ../src/download.c:521 ../src/download.c:653 +#: ../src/download.c:526 ../src/download.c:658 msgid "Complete" msgstr "" -#: ../src/download.c:529 ../src/download.c:661 +#: ../src/download.c:534 ../src/download.c:666 msgid "Downloading" msgstr "" -#: ../src/download.c:540 +#: ../src/download.c:545 msgid "Redirected to" msgstr "" -#: ../src/download.c:543 +#: ../src/download.c:548 msgid "Redirected" msgstr "" -#: ../src/download.c:550 +#: ../src/download.c:555 msgid "Resolved" msgstr "" -#: ../src/download.c:558 +#: ../src/download.c:563 msgid "Code " msgstr "" -#: ../src/download.c:616 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 +#: ../src/download.c:621 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 msgid "Unknown error" msgstr "" -#: ../src/download.c:682 +#: ../src/download.c:687 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" diff --git a/src/common/url.c b/src/common/url.c index 9590bae..c4de272 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2010 Pierre Pronchery */ +/* Copyright (c) 2011 Pierre Pronchery */ /* This file is part of DeforaOS Desktop Surfer */ /* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/download.c b/src/download.c index db65177..958753f 100644 --- a/src/download.c +++ b/src/download.c @@ -35,6 +35,7 @@ #endif #include "download.h" #include "../config.h" +#include "common/url.c" #define _(string) gettext(string) #define N_(string) (string) @@ -127,6 +128,7 @@ static void _download_label(GtkWidget * vbox, PangoFontDescription * bold, Download * download_new(DownloadPrefs * prefs, char const * url) { Download * download; + char * p; char buf[256]; GtkWidget * vbox; GtkWidget * hbox; @@ -151,7 +153,10 @@ Download * download_new(DownloadPrefs * prefs, char const * url) : NULL; download->prefs.user_agent = (prefs->user_agent != NULL) ? strdup(prefs->user_agent) : NULL; + if((p = _ghtml_make_url(NULL, url)) != NULL) + url = p; download->url = strdup(url); + free(p); if(download->url != NULL && prefs->output == NULL) download->prefs.output = strdup(basename(download->url)); download->conn = NULL; @@ -172,7 +177,7 @@ Download * download_new(DownloadPrefs * prefs, char const * url) } /* window */ download->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - snprintf(buf, sizeof(buf), "%s %s", _("Download"), url); + snprintf(buf, sizeof(buf), "%s %s", _("Download"), download->url); gtk_window_set_title(GTK_WINDOW(download->window), buf); g_signal_connect_swapped(G_OBJECT(download->window), "delete-event", G_CALLBACK(_download_on_closex), download); @@ -188,7 +193,7 @@ Download * download_new(DownloadPrefs * prefs, char const * url) gtk_size_group_add_widget(left, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); download->address = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(download->address), url); + gtk_entry_set_text(GTK_ENTRY(download->address), download->url); gtk_editable_set_editable(GTK_EDITABLE(download->address), FALSE); gtk_box_pack_start(GTK_BOX(hbox), download->address, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);