diff options
| author | Martin Natano <natano@natano.net> | 2012-04-10 21:29:56 +0200 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2012-04-10 21:29:56 +0200 |
| commit | cf4e5bd1948d8c7654599a75509beb2dbba52341 (patch) | |
| tree | becdc424f762a545bc477e92e6c9b223efdd23d3 /midori/midori-browser.c | |
| parent | 64404e5dcddda769c7c9ed2aa08b1aac4a4357fa (diff) | |
| download | midori-cf4e5bd1948d8c7654599a75509beb2dbba52341.tar.gz | |
Replace illegal characters in filenames
Fixes: https://bugs.launchpad.net/midori/+bug/972931
Diffstat (limited to 'midori/midori-browser.c')
| -rw-r--r-- | midori/midori-browser.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ae3fae0d..e5450f7d 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1417,7 +1417,7 @@ static gchar* midori_browser_download_prepare_destination_uri (WebKitDownload* download, const gchar* folder) { - const gchar* suggested_filename; + gchar* suggested_filename; GFile* file_source; gchar* file_basename; gchar* download_dir = NULL; @@ -1425,8 +1425,9 @@ midori_browser_download_prepare_destination_uri (WebKitDownload* download, gchar* destination_filename; gchar* midori_tmp_dir; - suggested_filename = webkit_download_get_suggested_filename (download); + suggested_filename = sokoke_get_download_filename (download); file_source = g_file_new_for_uri (suggested_filename); + g_free (suggested_filename); file_basename = g_file_get_basename (file_source); if (folder == NULL) { @@ -1472,6 +1473,7 @@ midori_view_download_requested_cb (GtkWidget* view, if (g_object_get_data (G_OBJECT (download), "save-as-download")) { static GtkWidget* dialog = NULL; + gchar* filename; if (!dialog) { @@ -1490,8 +1492,9 @@ midori_view_download_requested_cb (GtkWidget* view, G_CALLBACK (midori_view_download_save_as_response_cb), browser); } g_object_set_data (G_OBJECT (dialog), "download", download); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), - webkit_download_get_suggested_filename (download)); + filename = sokoke_get_download_filename (download); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); + g_free (filename); gtk_widget_show (dialog); } else |