(no commit message)

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index e202433..d3f134b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,12 +22,12 @@
 #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,25 +81,27 @@ 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"));
+       ttrss_set_config(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));
 
        printf("update(): clear feed tree\n");
        model_state = 1;
        gtk_list_store_clear(GTK_LIST_STORE(model));
+       gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(w_headlineview)));
        printf("update(): clear feed tree done\n");
        feeds = ttrss_get_feeds();
-       while(feeds && *feeds) {
+       while (feeds && *feeds) {
                if ((*feeds)->unread)
                        title = g_strdup_printf("<b>%s (%d)</b>",
                                                (*feeds)->title,
                                                (*feeds)->unread);
                else
                        title = strdup((*feeds)->title);
-               
+
 
                gtk_list_store_append(GTK_LIST_STORE(model), &iter);
 
@@ -150,13 +152,13 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 
        if (gtk_dialog_run(diag)) {
                g_settings_set_string(settings,
-                                     "password", 
+                                     "password",
                                      gtk_entry_get_text(pwd));
                g_settings_set_string(settings,
-                                     "url", 
+                                     "url",
                                      gtk_entry_get_text(url));
                g_settings_set_string(settings,
-                                     "user", 
+                                     "user",
                                      gtk_entry_get_text(login));
 
                update();
@@ -178,6 +180,9 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        struct headline **headlines;
        char *title;
 
+       if (model_state)
+               return TRUE;
+
        printf("feed_cursor_changed_cbk\n");
 
        gtk_tree_view_get_cursor(treeview, &path, &cols);
@@ -192,7 +197,7 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                model_state = 1;
                gtk_list_store_clear(headline_store);
 
-               headlines = ttrss_get_headlines(feed);
+               headlines = ttrss_feed_get_headlines(feed);
                while (headlines && *headlines) {
                        gtk_list_store_append(headline_store, &iter);
 
@@ -230,7 +235,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        const char *str;
 
        printf("headline_cursor_changed_cbk\n");
-       
+
        if (model_state)
                return TRUE;
 
@@ -243,14 +248,21 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
                str = ttrss_get_headline_content(headline);
 
-               if (headline->unread)
-                       ttrss_set_article_unread(headline->id, 0);
-
                if (str)
                        web_load(str);
                else
                        web_load("");
 
+               if (headline->unread) {
+                       ttrss_set_article_unread(headline->id, 0);
+                       headline->unread = 0;
+               }
+
+               gtk_list_store_set(GTK_LIST_STORE(model),
+                                  &iter,
+                                  0, headline->title,
+                                  -1);
+
                gtk_tree_path_free(path);
        }
 
@@ -276,11 +288,11 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
                gtk_tree_model_get(model, &iter, 1, &feed, -1);
                url = feed->url;
 
-               if (gtk_widget_has_screen (widget))
+               if (gtk_widget_has_screen(widget))
                        screen = gtk_widget_get_screen(widget);
                else
                        screen = gdk_screen_get_default();
-               
+
                printf("%s\n", url);
 
                error = NULL;
@@ -335,7 +347,7 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       phttp_init();
+       http_init();
 
        gtk_init(NULL, NULL);
        settings = g_settings_new("prss");