[Commits] [SCM] claws branch, master, updated. 3.13.0-17-gaeb5b6a

[ticho at claws-mail.org]

The branch, master has been updated
       via  aeb5b6ad61afcdaf27639eda07cefa55c058dac6 (commit)
      from  966533831c173434e600e9278be65b0d75021ca3 (commit)

Summary of changes:
 src/plugins/rssyl/rssyl_update_feed.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit aeb5b6ad61afcdaf27639eda07cefa55c058dac6
Author: Andrej Kacian <andrej at kacian.sk>
Date:   Mon Oct 19 16:53:32 2015 +0200

    RSSyl: Accept feeds with no title. Closes bug #3480.

diff --git a/src/plugins/rssyl/rssyl_update_feed.c b/src/plugins/rssyl/rssyl_update_feed.c
index 8e8b964..398a642 100644
--- a/src/plugins/rssyl/rssyl_update_feed.c
+++ b/src/plugins/rssyl/rssyl_update_feed.c
@@ -134,9 +134,7 @@ void rssyl_fetch_feed(RFetchCtx *ctx, gboolean verbose)
 
 		ctx->success = FALSE;
 	} else {
-		if( feed_get_title(ctx->feed) == NULL ) {
-			/* libcurl was happy, but libfeed wasn't */
-			debug_print("RSSyl: Error reading feed\n");
+		if( ctx->feed == NULL ) {
 			if( verbose ) {
 				gchar *msg = g_markup_printf_escaped(
 						(const char *) _("No valid feed found at\n<b>%s</b>"),
@@ -149,6 +147,11 @@ void rssyl_fetch_feed(RFetchCtx *ctx, gboolean verbose)
 					feed_get_url(ctx->feed));
 
 			ctx->success = FALSE;
+		} else if (feed_get_title(ctx->feed) == NULL) {
+			/* We shouldn't do this, since a title is mandatory. */
+			feed_set_title(ctx->feed, _("Untitled feed"));
+			log_print(LOG_PROTOCOL, _("Possibly invalid feed without title at %s.\n"),
+						feed_get_url(ctx->feed));
 		}
 	}
 }

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail