(no commit message)

[prss.git] / src / ttrss_ws.c

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 92bd60c..4fc64e2 100644 (file)
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -30,7 +30,7 @@
 #include "ttrss_ws.h"
 #include "url.h"
 
-static pthread_mutex_t *lock;
+static pthread_mutex_t lock;
 
 static char *session_id;
 static char *session_url;
@@ -134,7 +134,7 @@ struct json_object *ws_execute(struct json_object *rq)
        struct json_object *result;
 
        log_debug("ws_execute()");
-       pthread_mutex_lock(lock);
+       pthread_mutex_lock(&lock);
        log_debug("ws_execute() lock");
 
        err = NULL;
@@ -152,7 +152,7 @@ struct json_object *ws_execute(struct json_object *rq)
        }
 
        log_debug("ws_execute() unlock");
-       pthread_mutex_unlock(lock);
+       pthread_mutex_unlock(&lock);
 
        log_debug("ws_execute()");
 
@@ -208,7 +208,7 @@ char *ws_login()
 
 int ws_open_session()
 {
-       int /*version, */result;
+       int version, result;
 
        log_debug("ws_open_session()");
 
@@ -219,7 +219,7 @@ int ws_open_session()
        session_id = ws_login();
 
        if (session_id) {
-               /*version = ws_get_api_version();
+               version = ws_get_api_version();
                log_debug("API version= %d", version);
 
                if (version > 0) {
@@ -228,7 +228,7 @@ int ws_open_session()
                        free(session_id);
                        session_id = NULL;
                        result = 0;
-                       }*/
+               }
                result = 1;
        } else {
                result =  0;
@@ -302,6 +302,10 @@ int ws_update_headlines(struct feed *feed)
                                                           "excerpt");
                                h->excerpt = strdup(json_object_get_string(j));
 
+                               j = json_object_object_get(jheadline,
+                                                          "updated");
+                               h->date = json_object_get_int(j);
+
                                tmp = headlines_add(feed->headlines, h);
                                if (feed->headlines)
                                        free(feed->headlines);
@@ -404,8 +408,6 @@ void ws_set_article_unread(int id, int unread)
 void ws_init()
 {
        pthread_mutexattr_t    attr;
-
        pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-       lock = malloc(sizeof(pthread_mutex_t));
-       pthread_mutex_init(lock, &attr);
+       pthread_mutex_init(&lock, &attr);
 }