debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Display file name in download dialog

Browse source
This commit is contained in:
André Stösel 2012-03-06 17:10:45 +01:00 committed by Christian Dywan
parent fa22841ec9
commit 2837494ade
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/midori-view.c
View file

@ -2770,6 +2770,8 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
gchar* content_type; gchar* content_type;
gchar* description; gchar* description;
gchar* file_type; gchar* file_type;
gchar* file_name;
WebKitDownload *download;
WebKitWebDataSource* datasource; WebKitWebDataSource* datasource;
WebKitNetworkRequest* original_request; WebKitNetworkRequest* original_request;
const gchar* original_uri; const gchar* original_uri;
@ -2833,6 +2835,11 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
file_type = g_strdup_printf (_("File Type: %s ('%s')"), description, mime_type); file_type = g_strdup_printf (_("File Type: %s ('%s')"), description, mime_type);
g_free (description); g_free (description);
download = webkit_download_new (request);
file_name = g_strdup_printf (_("File Name: %s"),
webkit_download_get_suggested_filename (download));
g_object_unref (download);
/* Link Fingerprint */ /* Link Fingerprint */
/* We look at the original URI because redirection would lose the fragment */ /* We look at the original URI because redirection would lose the fragment */
datasource = webkit_web_frame_get_provisional_data_source (web_frame); datasource = webkit_web_frame_get_provisional_data_source (web_frame);
@ -2840,9 +2847,10 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
original_uri = webkit_network_request_get_uri (original_request); original_uri = webkit_network_request_get_uri (original_request);
midori_uri_get_fingerprint (original_uri, &fingerprint, &fplabel); midori_uri_get_fingerprint (original_uri, &fingerprint, &fplabel);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
"%s\n%s %s", file_type, fplabel ? fplabel : "", fingerprint ? fingerprint : ""); "%s\n%s\n%s %s", file_name, file_type, fplabel ? fplabel : "", fingerprint ? fingerprint : "");
g_free (fingerprint); g_free (fingerprint);
g_free (fplabel); g_free (fplabel);
g_free (file_name);
g_free (file_type); g_free (file_type);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);