From c6e1efc5d14895adeddd08dca19a954efa6fabdc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 29 Apr 2013 21:53:51 +0000 Subject: [PATCH] --- src/main.c | 7 +++---- src/ttrss_ws.c | 7 ++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index 39ad7c3..132aec1 100644 --- a/src/main.c +++ b/src/main.c @@ -130,14 +130,13 @@ void update() COL_FEED_ID, (*feeds)->id, -1); free(title); + + ttrs_download_headline_content(feeds); + feeds++; } model_state = 0; - feeds = ttrss_get_feeds(); - if (feeds) - ttrs_download_headline_content(feeds); - log_debug("update() done"); } diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c index 4b9c040..0aed58d 100644 --- a/src/ttrss_ws.c +++ b/src/ttrss_ws.c @@ -245,7 +245,6 @@ int ws_open_session() session_id = NULL; result = 0; } - result = 1; } else { result = 0; } @@ -331,6 +330,12 @@ int ws_update_headlines(struct feed *feed) j = json_object_object_get(jheadline, "unread"); h->unread = json_object_get_boolean(j); } + + if (!feed->headlines) { + feed->headlines = malloc(sizeof(struct headline *)); + *(feed->headlines) = NULL; + } + json_object_put(rp); return 1; } else { -- 2.7.4