X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=d3f134b0f203b48e4492fd7ad107bb62e04dfe14;hb=4e8c884a282bcf16f486d06164ee187faa8a2610;hp=ceeb9b795f236fe38312c1b85e1d861d3a74b17a;hpb=97542e5006d35e6eff636df6b610a359caaeafb9;p=prss.git

diff --git a/src/main.c b/src/main.c
index ceeb9b7..d3f134b 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'},
@@ -80,22 +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);
 
@@ -107,6 +113,8 @@ void update()
 		free(title);
 		feeds++;
 	}
+	model_state = 0;
+
 	printf("refresh done\n");
 }
 
@@ -144,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();
@@ -172,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);
@@ -183,9 +194,10 @@ 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);
+		headlines = ttrss_feed_get_headlines(feed);
 		while (headlines && *headlines) {
 			gtk_list_store_append(headline_store, &iter);
 
@@ -206,6 +218,7 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 			headlines++;
 		}
 
+		model_state = 0;
 		gtk_tree_path_free(path);
 	}
 
@@ -223,6 +236,9 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 	printf("headline_cursor_changed_cbk\n");
 
+	if (model_state)
+		return TRUE;
+
 	gtk_tree_view_get_cursor(treeview, &path, &cols);
 
 	if (path) {
@@ -230,19 +246,60 @@ 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);
 	}
 
 	return TRUE;
 }
 
+void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
+{
+	GdkScreen *screen;
+	GError *error;
+	GtkTreeSelection *selection;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	struct feed *feed;
+	const char *url;
+
+	printf("headline_row_activated_cbk\n");
+
+	selection = gtk_tree_view_get_selection(w_headlineview);
+	model = gtk_tree_view_get_model(w_headlineview);
+
+	if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+		gtk_tree_model_get(model, &iter, 1, &feed, -1);
+		url = feed->url;
+
+		if (gtk_widget_has_screen(widget))
+			screen = gtk_widget_get_screen(widget);
+		else
+			screen = gdk_screen_get_default();
+
+		printf("%s\n", url);
+
+		error = NULL;
+		gtk_show_uri(screen, url, gtk_get_current_event_time(), &error);
+	}
+}
+
 gboolean
 window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
@@ -290,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");