[Commits] [SCM] claws branch, master, updated. 3.11.1-34-g5c904ff

[ticho at claws-mail.org]

The branch, master has been updated
       via  5c904ffa6257f591d0ffde8d90faa592bc384270 (commit)
       via  3143d89fc0f2124fd43c5da5a776f2349408033d (commit)
      from  dbedfb9340ffe9a76c2ab6ba3f26c244df00fb54 (commit)

Summary of changes:
 src/plugins/rssyl/libfeed/parser_atom10.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 5c904ffa6257f591d0ffde8d90faa592bc384270
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Nov 27 03:23:46 2014 +0100

    RSSyl: Fix argument order for strstr() in Atom parser.

diff --git a/src/plugins/rssyl/libfeed/parser_atom10.c b/src/plugins/rssyl/libfeed/parser_atom10.c
index 7e475b3..f3a9e0d 100644
--- a/src/plugins/rssyl/libfeed/parser_atom10.c
+++ b/src/plugins/rssyl/libfeed/parser_atom10.c
@@ -135,7 +135,7 @@ void feed_parser_atom10_end(void *data, const gchar *el)
 
 				/* Fix up URL, if it is relative */
 				if (ctx->curitem->url != NULL &&
-						!strstr("://", ctx->curitem->url) &&
+						!strstr(ctx->curitem->url, "://") &&
 						ctx->feed->link != NULL) {
 					tmp = g_strconcat(ctx->feed->link,
 							(ctx->curitem->url[0] == '/' ? "" : "/"),

commit 3143d89fc0f2124fd43c5da5a776f2349408033d
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Nov 27 03:22:17 2014 +0100

    RSSyl: Ignore rel="..." feed link in Atom parser.

diff --git a/src/plugins/rssyl/libfeed/parser_atom10.c b/src/plugins/rssyl/libfeed/parser_atom10.c
index f1ba9b3..7e475b3 100644
--- a/src/plugins/rssyl/libfeed/parser_atom10.c
+++ b/src/plugins/rssyl/libfeed/parser_atom10.c
@@ -48,9 +48,12 @@ void feed_parser_atom10_start(void *data, const gchar *el, const gchar **attr)
 			 * Set correct location. */
 			ctx->location = FEED_LOC_ATOM10_AUTHOR;
 		} else if( !strcmp(el, "link") ) {
-			/* Link tag for the feed */
-			g_free(ctx->feed->link);
-			ctx->feed->link = g_strdup(feed_parser_get_attribute_value(attr, "href"));
+			if (!feed_parser_get_attribute_value(attr, "rel")) {
+				/* Link tag for the feed */
+				g_free(ctx->feed->link);
+				ctx->feed->link =
+					g_strdup(feed_parser_get_attribute_value(attr, "href"));
+			}
 		} else ctx->location = FEED_LOC_ATOM10_NONE;
 
 	} else if( ctx->depth == 2 ) {

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


hooks/post-receive
-- 
Claws Mail