[evolution-rss] hide individual feed errors by default it gests annoying to have a lot of errors alert dialogs for e
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-rss] hide individual feed errors by default it gests annoying to have a lot of errors alert dialogs for e
- Date: Thu, 12 Mar 2015 09:23:17 +0000 (UTC)
commit a219947f11e5cc19c3ebfd663e8e2ebcde4fa5ec
Author: Lucian Langa <lucilanga gnome org>
Date: Thu Mar 12 10:11:55 2015 +0100
hide individual feed errors by default
it gests annoying to have a lot of errors alert dialogs for each feed
every time it is fetched.
...e.evolution.plugin.evolution-rss.gschema.xml.in | 5 +++++
src/rss.c | 7 +++++--
src/rss.h | 1 +
3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/src/org.gnome.evolution.plugin.evolution-rss.gschema.xml.in
b/src/org.gnome.evolution.plugin.evolution-rss.gschema.xml.in
index 127657d..e982583 100644
--- a/src/org.gnome.evolution.plugin.evolution-rss.gschema.xml.in
+++ b/src/org.gnome.evolution.plugin.evolution-rss.gschema.xml.in
@@ -140,6 +140,11 @@
<summary>Report xml errors</summary>
<description>Print xml errors in the feeds</description>
</key>
+ <key name="show-feed-errors" type="b">
+ <default>false</default>
+ <summary>Report feed errors</summary>
+ <description>Report feed errors</description>
+ </key>
<key name="use-proxy" type="b">
<default>false</default>
<summary>Use proxy server</summary>
diff --git a/src/rss.c b/src/rss.c
index 47ac17d..69d49a5 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -2131,6 +2131,7 @@ generic_finish_feed(rfMessage *msg, gpointer user_data)
#if (EVOLUTION_VERSION < 22900)
MailComponent *mc = mail_component_peek ();
#endif
+ GSettings *settings = g_settings_new(RSS_CONF_SCHEMA);
//feed might get deleted while fetching
//so we need to test for the presence of key
@@ -2192,8 +2193,11 @@ generic_finish_feed(rfMessage *msg, gpointer user_data)
if (rf->cancel_all)
goto out;
+
if (msg->status_code != SOUP_STATUS_OK &&
- msg->status_code != SOUP_STATUS_CANCELLED) {
+ msg->status_code != SOUP_STATUS_CANCELLED &&
+ g_settings_get_boolean (settings, CONF_SHOW_FEED_ERRORS)) {
+
g_set_error(&err,
NET_ERROR,
NET_ERROR_GENERIC,
@@ -2264,7 +2268,6 @@ generic_finish_feed(rfMessage *msg, gpointer user_data)
gchar *title;
xmlError *err;
gchar *tmsg;
- GSettings *settings = g_settings_new(RSS_CONF_SCHEMA);
if (!g_settings_get_boolean (settings,
CONF_SHOW_XML_ERRORS))
goto out;
diff --git a/src/rss.h b/src/rss.h
index f31919a..9205665 100644
--- a/src/rss.h
+++ b/src/rss.h
@@ -235,6 +235,7 @@ typedef struct _rssfeed {
#define CONF_FEED_ICON "feed-icon"
#define CONF_SHOW_COMMENTS "show-comments"
#define CONF_SHOW_XML_ERRORS "show-xml-errors"
+#define CONF_SHOW_FEED_ERRORS "show-feed-errors"
#endif
enum {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]