[epiphany] embed-shell: Improve error message when downloading filters fails
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] embed-shell: Improve error message when downloading filters fails
- Date: Sun, 22 Jan 2017 23:56:02 +0000 (UTC)
commit 2ec4cef600d57c79d8bacd27ecb6cdb24924fa4f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun Jan 22 17:09:06 2017 -0600
embed-shell: Improve error message when downloading filters fails
Let's print the URL that we failed to download.
embed/ephy-embed-shell.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 30b4c3c..0bdfe56 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -711,12 +711,14 @@ adblock_filter_file_is_valid (GFile *file)
typedef struct {
EphyEmbedShell *shell;
+ GFile *src_file;
GFile *filter_file;
GFile *tmp_file;
} AdblockFilterRetrieveData;
static AdblockFilterRetrieveData *
adblock_filter_retrieve_data_new (EphyEmbedShell *shell,
+ GFile *src_file,
GFile *filter_file)
{
AdblockFilterRetrieveData* data;
@@ -724,6 +726,7 @@ adblock_filter_retrieve_data_new (EphyEmbedShell *shell,
data = g_slice_new (AdblockFilterRetrieveData);
data->shell = g_object_ref (shell);
+ data->src_file = g_object_ref (src_file);
data->filter_file = g_object_ref (filter_file);
path = g_file_get_path (filter_file);
@@ -739,6 +742,7 @@ static void
adblock_filter_retrieve_data_free (AdblockFilterRetrieveData *data)
{
g_object_unref (data->shell);
+ g_object_unref (data->src_file);
g_object_unref (data->filter_file);
g_object_unref (data->tmp_file);
@@ -761,7 +765,7 @@ ephy_embed_shell_retrieve_filter_file_finished (GFile *src,
g_object_unref (stream);
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_warning ("Error retrieving filter: %s\n", error->message);
+ g_warning ("Error retrieving filter %s: %s\n", g_file_get_uri (data->src_file), error->message);
g_error_free (error);
}
@@ -780,7 +784,7 @@ ephy_embed_shell_retrieve_filter_file (EphyEmbedShell *shell,
if (!priv->uri_tester_update_cancellable)
priv->uri_tester_update_cancellable = g_cancellable_new ();
- data = adblock_filter_retrieve_data_new (shell, file);
+ data = adblock_filter_retrieve_data_new (shell, src, file);
g_file_copy_async (src, data->tmp_file,
G_FILE_COPY_OVERWRITE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]