X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=c9f15a97f1b42e94c950675d7ff430055c208777;hp=861309ddc40f32fbcde2a577db16e2034a95a338;hb=47231117238180500e22522eb470530bad381dd1;hpb=fd2d79da502acb8dcb4589413b7f529c762997f1

diff --git a/src/main.c b/src/main.c
index 861309d..c9f15a9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,17 +22,18 @@
 #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;
 static GSettings *settings;
 
+static int model_state;
 
 static struct option long_options[] = {
 	{"version", no_argument, 0, 'v'},
@@ -86,7 +87,10 @@ void update()
 
 	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));
+	printf("update(): clear feed tree done\n");
 	feeds = ttrss_get_feeds();
 	while(feeds && *feeds) {
 		if ((*feeds)->unread)
@@ -107,6 +111,8 @@ void update()
 		free(title);
 		feeds++;
 	}
+	model_state = 0;
+
 	printf("refresh done\n");
 }
 
@@ -183,6 +189,7 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 		headline_model = gtk_tree_view_get_model(w_headlineview);
 		headline_store = GTK_LIST_STORE(headline_model);
+		model_state = 1;
 		gtk_list_store_clear(headline_store);
 
 		headlines = ttrss_get_headlines(feed);
@@ -206,6 +213,7 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 			headlines++;
 		}
 
+		model_state = 0;
 		gtk_tree_path_free(path);
 	}
 
@@ -222,6 +230,9 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	const char *str;
 
 	printf("headline_cursor_changed_cbk\n");
+	
+	if (model_state)
+		return TRUE;
 
 	gtk_tree_view_get_cursor(treeview, &path, &cols);
 
@@ -230,13 +241,23 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		gtk_tree_model_get_iter(model, &iter, path);
 		gtk_tree_model_get(model, &iter, 1, &headline, -1);
 
-		str = ttrss_get_headline_content((struct headline *)headline);
+		str = ttrss_get_headline_content(headline);
 
 		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);
 	}
 
@@ -321,7 +342,7 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
-	phttp_init();
+	http_init();
 
 	gtk_init(NULL, NULL);
 	settings = g_settings_new("prss");