DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also unlink incomplete output files with WebKit's download backend

Browse Source
This commit is contained in:
Pierre Pronchery 2011-02-19 13:38:25 +00:00
parent eef907bc2e
commit 99bab69414
5 changed files with 77 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 14:34+0100\n" "POT-Creation-Date: 2011-02-19 14:37+0100\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: German\n" "Language-Team: German\n"
@ -67,7 +67,7 @@ msgstr ""
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:253 ../src/download.c:493 ../src/ghtml-gtkhtml.c:926 #: ../src/common/conn.c:253 ../src/download.c:497 ../src/ghtml-gtkhtml.c:926
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
@ -89,7 +89,7 @@ msgstr ""
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:348 ../src/download.c:570 ../src/ghtml-gtkhtml.c:1112 #: ../src/common/conn.c:348 ../src/download.c:574 ../src/ghtml-gtkhtml.c:1112
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -129,67 +129,67 @@ msgstr ""
msgid "Close window when the download is complete" msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:307 ../src/download.c:312 ../src/download.c:647 #: ../src/download.c:311 ../src/download.c:316 ../src/download.c:651
#: ../src/surfer.c:940 ../src/surfer.c:943 #: ../src/surfer.c:940 ../src/surfer.c:943
msgid "Error" msgid "Error"
msgstr "Fehler" msgstr "Fehler"
#: ../src/download.c:325 ../src/download.c:351 #: ../src/download.c:329 ../src/download.c:355
msgid "kB" msgid "kB"
msgstr "" msgstr ""
#: ../src/download.c:346 ../src/download.c:357 ../src/download.c:376 #: ../src/download.c:350 ../src/download.c:361 ../src/download.c:380
msgid "MB" msgid "MB"
msgstr "" msgstr ""
#: ../src/download.c:348 #: ../src/download.c:352
#, c-format #, c-format
msgid "%.1f %s/s" msgid "%.1f %s/s"
msgstr "" msgstr ""
#: ../src/download.c:359 #: ../src/download.c:363
#, c-format #, c-format
msgid "%.1f %s" msgid "%.1f %s"
msgstr "" msgstr ""
#: ../src/download.c:378 #: ../src/download.c:382
#, c-format #, c-format
msgid "%.1f of %.1f %s" msgid "%.1f of %.1f %s"
msgstr "" msgstr ""
#: ../src/download.c:501 #: ../src/download.c:505
msgid "Error " msgid "Error "
msgstr "Fehler " msgstr "Fehler "
#: ../src/download.c:526 ../src/download.c:658 #: ../src/download.c:530 ../src/download.c:662
msgid "Complete" msgid "Complete"
msgstr "" msgstr ""
#: ../src/download.c:534 ../src/download.c:666 #: ../src/download.c:538 ../src/download.c:670
msgid "Downloading" msgid "Downloading"
msgstr "" msgstr ""
#: ../src/download.c:545 #: ../src/download.c:549
msgid "Redirected to" msgid "Redirected to"
msgstr "" msgstr ""
#: ../src/download.c:548 #: ../src/download.c:552
msgid "Redirected" msgid "Redirected"
msgstr "" msgstr ""
#: ../src/download.c:555 #: ../src/download.c:559
msgid "Resolved" msgid "Resolved"
msgstr "" msgstr ""
#: ../src/download.c:563 #: ../src/download.c:567
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:621 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 #: ../src/download.c:625 ../src/ghtml-webkit.c:673 ../src/surfer.c:942
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
#: ../src/download.c:687 #: ../src/download.c:691
msgid "" msgid ""
"Usage: download [-O output][-U user-agent] URL...\n" "Usage: download [-O output][-U user-agent] URL...\n"
" -O\tFile to write document to\n" " -O\tFile to write document to\n"

36
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 14:34+0100\n" "POT-Creation-Date: 2011-02-19 14:37+0100\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
@ -67,7 +67,7 @@ msgstr ""
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:253 ../src/download.c:493 ../src/ghtml-gtkhtml.c:926 #: ../src/common/conn.c:253 ../src/download.c:497 ../src/ghtml-gtkhtml.c:926
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
@ -89,7 +89,7 @@ msgstr ""
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:348 ../src/download.c:570 ../src/ghtml-gtkhtml.c:1112 #: ../src/common/conn.c:348 ../src/download.c:574 ../src/ghtml-gtkhtml.c:1112
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -129,67 +129,67 @@ msgstr ""
msgid "Close window when the download is complete" msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:307 ../src/download.c:312 ../src/download.c:647 #: ../src/download.c:311 ../src/download.c:316 ../src/download.c:651
#: ../src/surfer.c:940 ../src/surfer.c:943 #: ../src/surfer.c:940 ../src/surfer.c:943
msgid "Error" msgid "Error"
msgstr "" msgstr ""
#: ../src/download.c:325 ../src/download.c:351 #: ../src/download.c:329 ../src/download.c:355
msgid "kB" msgid "kB"
msgstr "" msgstr ""
#: ../src/download.c:346 ../src/download.c:357 ../src/download.c:376 #: ../src/download.c:350 ../src/download.c:361 ../src/download.c:380
msgid "MB" msgid "MB"
msgstr "" msgstr ""
#: ../src/download.c:348 #: ../src/download.c:352
#, c-format #, c-format
msgid "%.1f %s/s" msgid "%.1f %s/s"
msgstr "" msgstr ""
#: ../src/download.c:359 #: ../src/download.c:363
#, c-format #, c-format
msgid "%.1f %s" msgid "%.1f %s"
msgstr "" msgstr ""
#: ../src/download.c:378 #: ../src/download.c:382
#, c-format #, c-format
msgid "%.1f of %.1f %s" msgid "%.1f of %.1f %s"
msgstr "" msgstr ""
#: ../src/download.c:501 #: ../src/download.c:505
msgid "Error " msgid "Error "
msgstr "" msgstr ""
#: ../src/download.c:526 ../src/download.c:658 #: ../src/download.c:530 ../src/download.c:662
msgid "Complete" msgid "Complete"
msgstr "" msgstr ""
#: ../src/download.c:534 ../src/download.c:666 #: ../src/download.c:538 ../src/download.c:670
msgid "Downloading" msgid "Downloading"
msgstr "" msgstr ""
#: ../src/download.c:545 #: ../src/download.c:549
msgid "Redirected to" msgid "Redirected to"
msgstr "" msgstr ""
#: ../src/download.c:548 #: ../src/download.c:552
msgid "Redirected" msgid "Redirected"
msgstr "" msgstr ""
#: ../src/download.c:555 #: ../src/download.c:559
msgid "Resolved" msgid "Resolved"
msgstr "" msgstr ""
#: ../src/download.c:563 #: ../src/download.c:567
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:621 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 #: ../src/download.c:625 ../src/ghtml-webkit.c:673 ../src/surfer.c:942
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
#: ../src/download.c:687 #: ../src/download.c:691
msgid "" msgid ""
"Usage: download [-O output][-U user-agent] URL...\n" "Usage: download [-O output][-U user-agent] URL...\n"
" -O\tFile to write document to\n" " -O\tFile to write document to\n"

36
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 14:34+0100\n" "POT-Creation-Date: 2011-02-19 14:37+0100\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Calimero <calimeroteknik@free.fr>\n" "Last-Translator: Calimero <calimeroteknik@free.fr>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -69,7 +69,7 @@ msgstr "Réseau"
msgid "Resolving..." msgid "Resolving..."
msgstr "Résolution du domaine..." msgstr "Résolution du domaine..."
#: ../src/common/conn.c:253 ../src/download.c:493 ../src/ghtml-gtkhtml.c:926 #: ../src/common/conn.c:253 ../src/download.c:497 ../src/ghtml-gtkhtml.c:926
msgid "Connected" msgid "Connected"
msgstr "Connecté" msgstr "Connecté"
@ -91,7 +91,7 @@ msgstr "Hôte inconnu"
msgid "Unspecified error" msgid "Unspecified error"
msgstr "Erreur non spécifiée" msgstr "Erreur non spécifiée"
#: ../src/common/conn.c:348 ../src/download.c:570 ../src/ghtml-gtkhtml.c:1112 #: ../src/common/conn.c:348 ../src/download.c:574 ../src/ghtml-gtkhtml.c:1112
msgid "Timeout" msgid "Timeout"
msgstr "Délai dépassé" msgstr "Délai dépassé"
@ -131,67 +131,67 @@ msgstr "0.0 Kio/s"
msgid "Close window when the download is complete" msgid "Close window when the download is complete"
msgstr "Fermer la fenêtre à la fin du téléchargement" msgstr "Fermer la fenêtre à la fin du téléchargement"
#: ../src/download.c:307 ../src/download.c:312 ../src/download.c:647 #: ../src/download.c:311 ../src/download.c:316 ../src/download.c:651
#: ../src/surfer.c:940 ../src/surfer.c:943 #: ../src/surfer.c:940 ../src/surfer.c:943
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"
#: ../src/download.c:325 ../src/download.c:351 #: ../src/download.c:329 ../src/download.c:355
msgid "kB" msgid "kB"
msgstr "Kio" msgstr "Kio"
#: ../src/download.c:346 ../src/download.c:357 ../src/download.c:376 #: ../src/download.c:350 ../src/download.c:361 ../src/download.c:380
msgid "MB" msgid "MB"
msgstr "Mo" msgstr "Mo"
#: ../src/download.c:348 #: ../src/download.c:352
#, c-format #, c-format
msgid "%.1f %s/s" msgid "%.1f %s/s"
msgstr "%.1f %s/s" msgstr "%.1f %s/s"
#: ../src/download.c:359 #: ../src/download.c:363
#, c-format #, c-format
msgid "%.1f %s" msgid "%.1f %s"
msgstr "%.1f %s/s" msgstr "%.1f %s/s"
#: ../src/download.c:378 #: ../src/download.c:382
#, c-format #, c-format
msgid "%.1f of %.1f %s" msgid "%.1f of %.1f %s"
msgstr "%.1f de %.1f %s" msgstr "%.1f de %.1f %s"
#: ../src/download.c:501 #: ../src/download.c:505
msgid "Error " msgid "Error "
msgstr "Erreur " msgstr "Erreur "
#: ../src/download.c:526 ../src/download.c:658 #: ../src/download.c:530 ../src/download.c:662
msgid "Complete" msgid "Complete"
msgstr "Terminé" msgstr "Terminé"
#: ../src/download.c:534 ../src/download.c:666 #: ../src/download.c:538 ../src/download.c:670
msgid "Downloading" msgid "Downloading"
msgstr "Téléchargement" msgstr "Téléchargement"
#: ../src/download.c:545 #: ../src/download.c:549
msgid "Redirected to" msgid "Redirected to"
msgstr "Redirigé vers" msgstr "Redirigé vers"
#: ../src/download.c:548 #: ../src/download.c:552
msgid "Redirected" msgid "Redirected"
msgstr "Redirigé" msgstr "Redirigé"
#: ../src/download.c:555 #: ../src/download.c:559
msgid "Resolved" msgid "Resolved"
msgstr "Résolu" msgstr "Résolu"
#: ../src/download.c:563 #: ../src/download.c:567
msgid "Code " msgid "Code "
msgstr "Code " msgstr "Code "
#: ../src/download.c:621 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 #: ../src/download.c:625 ../src/ghtml-webkit.c:673 ../src/surfer.c:942
msgid "Unknown error" msgid "Unknown error"
msgstr "Erreur inconnue" msgstr "Erreur inconnue"
#: ../src/download.c:687 #: ../src/download.c:691
msgid "" msgid ""
"Usage: download [-O output][-U user-agent] URL...\n" "Usage: download [-O output][-U user-agent] URL...\n"
" -O\tFile to write document to\n" " -O\tFile to write document to\n"

36
po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 14:34+0100\n" "POT-Creation-Date: 2011-02-19 14:37+0100\n"
"PO-Revision-Date: 2010-04-11 12:06+0200\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n" "Language-Team: Italian\n"
@ -67,7 +67,7 @@ msgstr ""
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:253 ../src/download.c:493 ../src/ghtml-gtkhtml.c:926 #: ../src/common/conn.c:253 ../src/download.c:497 ../src/ghtml-gtkhtml.c:926
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
@ -89,7 +89,7 @@ msgstr ""
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:348 ../src/download.c:570 ../src/ghtml-gtkhtml.c:1112 #: ../src/common/conn.c:348 ../src/download.c:574 ../src/ghtml-gtkhtml.c:1112
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -129,67 +129,67 @@ msgstr ""
msgid "Close window when the download is complete" msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:307 ../src/download.c:312 ../src/download.c:647 #: ../src/download.c:311 ../src/download.c:316 ../src/download.c:651
#: ../src/surfer.c:940 ../src/surfer.c:943 #: ../src/surfer.c:940 ../src/surfer.c:943
msgid "Error" msgid "Error"
msgstr "" msgstr ""
#: ../src/download.c:325 ../src/download.c:351 #: ../src/download.c:329 ../src/download.c:355
msgid "kB" msgid "kB"
msgstr "" msgstr ""
#: ../src/download.c:346 ../src/download.c:357 ../src/download.c:376 #: ../src/download.c:350 ../src/download.c:361 ../src/download.c:380
msgid "MB" msgid "MB"
msgstr "" msgstr ""
#: ../src/download.c:348 #: ../src/download.c:352
#, c-format #, c-format
msgid "%.1f %s/s" msgid "%.1f %s/s"
msgstr "" msgstr ""
#: ../src/download.c:359 #: ../src/download.c:363
#, c-format #, c-format
msgid "%.1f %s" msgid "%.1f %s"
msgstr "" msgstr ""
#: ../src/download.c:378 #: ../src/download.c:382
#, c-format #, c-format
msgid "%.1f of %.1f %s" msgid "%.1f of %.1f %s"
msgstr "" msgstr ""
#: ../src/download.c:501 #: ../src/download.c:505
msgid "Error " msgid "Error "
msgstr "" msgstr ""
#: ../src/download.c:526 ../src/download.c:658 #: ../src/download.c:530 ../src/download.c:662
msgid "Complete" msgid "Complete"
msgstr "" msgstr ""
#: ../src/download.c:534 ../src/download.c:666 #: ../src/download.c:538 ../src/download.c:670
msgid "Downloading" msgid "Downloading"
msgstr "" msgstr ""
#: ../src/download.c:545 #: ../src/download.c:549
msgid "Redirected to" msgid "Redirected to"
msgstr "" msgstr ""
#: ../src/download.c:548 #: ../src/download.c:552
msgid "Redirected" msgid "Redirected"
msgstr "" msgstr ""
#: ../src/download.c:555 #: ../src/download.c:559
msgid "Resolved" msgid "Resolved"
msgstr "" msgstr ""
#: ../src/download.c:563 #: ../src/download.c:567
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:621 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 #: ../src/download.c:625 ../src/ghtml-webkit.c:673 ../src/surfer.c:942
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
#: ../src/download.c:687 #: ../src/download.c:691
msgid "" msgid ""
"Usage: download [-O output][-U user-agent] URL...\n" "Usage: download [-O output][-U user-agent] URL...\n"
" -O\tFile to write document to\n" " -O\tFile to write document to\n"

4
src/download.c
View File

@ -254,8 +254,12 @@ void download_delete(Download * download)
g_source_remove(download->timeout); g_source_remove(download->timeout);
#ifdef WITH_WEBKIT #ifdef WITH_WEBKIT
if(download->conn != NULL) if(download->conn != NULL)
{
webkit_download_cancel(download->conn); webkit_download_cancel(download->conn);
if(unlink(download->prefs.output) != 0)
_download_error(download, download->prefs.output, 1);
/* XXX should also unlink the (temporary) output file */ /* XXX should also unlink the (temporary) output file */
}
#else #else
if(download->conn != NULL) if(download->conn != NULL)
gnet_conn_http_delete(download->conn); gnet_conn_http_delete(download->conn);