X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=849c112d0c8ef3b560052e96628298fe37477855;hp=9de84d4f59111de7361d2e05d0347c4fc59e7fb3;hb=48e7c0631ee3371b5cf6503417b4ec1c2b733176;hpb=1070b8de5c6cdf5e5958675a1b90f0af3e3f4688

diff --git a/src/main.c b/src/main.c
index 9de84d4..849c112 100644
--- a/src/main.c
+++ b/src/main.c
@@ -81,33 +81,29 @@ void update()
 	GtkTreeIter iter;
 	char *title;
 
-	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));
 
 	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);
 
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
 				   0, title,
-				   1, (*feeds),
+				   1, (*feeds)->id,
 				   -1);
 		free(title);
 		feeds++;
@@ -151,13 +147,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 +174,10 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	struct feed *feed;
 	struct headline **headlines;
 	char *title;
+	int feed_id;
+
+	if (model_state)
+		return TRUE;
 
 	printf("feed_cursor_changed_cbk\n");
 
@@ -186,32 +186,37 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	if (path) {
 		model = gtk_tree_view_get_model(treeview);
 		gtk_tree_model_get_iter(model, &iter, path);
-		gtk_tree_model_get(model, &iter, 1, &feed, -1);
+		gtk_tree_model_get(model, &iter, 1, &feed_id, -1);
+
+		feed = ttrss_get_feed(feed_id);
 
 		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);
-		while (headlines && *headlines) {
-			gtk_list_store_append(headline_store, &iter);
-
-			if ((*headlines)->unread)
-				title = g_strdup_printf("<b>%s</b>",
-							(*headlines)->title);
-			else
-				title = strdup((*headlines)->title);
-
-			gtk_list_store_set(headline_store,
-					   &iter,
-					   0, title,
-					   1, (*headlines),
-					   -1);
-
-			free(title);
-
-			headlines++;
+		if (feed) {
+			headlines = ttrss_feed_get_headlines(feed);
+			while (headlines && *headlines) {
+				gtk_list_store_append(headline_store, &iter);
+				
+				if ((*headlines)->unread)
+					title = g_strdup_printf
+						("<b>%s</b>",
+						 (*headlines)->title);
+				else
+					title = strdup((*headlines)->title);
+				
+				gtk_list_store_set(headline_store,
+						   &iter,
+						   0, title,
+						   1, (*headlines),
+						   -1);
+				
+				free(title);
+				
+				headlines++;
+			}
 		}
 
 		model_state = 0;
@@ -231,7 +236,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	const char *str;
 
 	printf("headline_cursor_changed_cbk\n");
-	
+
 	if (model_state)
 		return TRUE;
 
@@ -284,11 +289,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;
@@ -348,6 +353,11 @@ int main(int argc, char **argv)
 	gtk_init(NULL, NULL);
 	settings = g_settings_new("prss");
 
+	ttrss_set_config(g_settings_get_string(settings, "url"),
+			 g_settings_get_string(settings, "user"),
+			 g_settings_get_string(settings, "password"));
+	ws_open_session();
+
 	builder = gtk_builder_new();
 	gtk_builder_add_from_file
 		(builder,