(no commit message)
[prss.git] / src / main.c
index b01700e..9de84d4 100644 (file)
 #include <getopt.h>
 
 #include <json/json.h>
-#include "ttrss.h"
 #include <webkit/webkit.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "phttp.h"
+#include "http.h"
+#include "ttrss.h"
 #include "webbrowser.h"
 
 static const char *program_name;
@@ -81,9 +81,10 @@ void update()
        GtkTreeIter iter;
        char *title;
 
-       ttrss_login(g_settings_get_string(settings, "url"),
-                   g_settings_get_string(settings, "user"),
-                   g_settings_get_string(settings, "password"));
+       ws_init(g_settings_get_string(settings, "url"),
+               g_settings_get_string(settings, "user"),
+               g_settings_get_string(settings, "password"));
+       ws_open_session();
 
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
 
@@ -342,7 +343,7 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       phttp_init();
+       http_init();
 
        gtk_init(NULL, NULL);
        settings = g_settings_new("prss");