(no commit message)

[prss.git] / src / ttrss_ws.c

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 4b9c040..1d52696 100644 (file)
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -103,6 +103,8 @@ static const char *ws_reply_get_error(struct json_object *content)
 {
        struct json_object *jerror;
 
+       log_debug("ws_reply_get_error");
+
        if (json_object_get_type(content) != json_type_object)
                return NULL;
 
@@ -131,6 +133,7 @@ execute(struct http_session *sess, struct json_object *rq, char **err)
                        str = ws_reply_get_error(content);
 
                        if (str) {
+                               log_debug("execute() err=%s", str);
                                *err = strdup(str);
                                content = NULL;
                        } else {
@@ -141,6 +144,8 @@ execute(struct http_session *sess, struct json_object *rq, char **err)
                json_object_put(rp);
        }
 
+       log_debug("execute() done");
+
        return content;
 }
 
@@ -245,7 +250,6 @@ int ws_open_session()
                        session_id = NULL;
                        result = 0;
                }
-               result = 1;
        } else {
                result =  0;
        }
@@ -331,6 +335,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 {