X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=39ad7c38b31e0b4ced8854987b997a4cbd65c57c;hp=b0d6852ebb5336b9ca3708211a04db868f57d489;hb=05d4d920a38f57f2afc0ef349d8f4c96a5852878;hpb=54c2b8d3bd8fe1a775263657d4c2d317de37f1e6

diff --git a/src/main.c b/src/main.c
index b0d6852..39ad7c3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,6 +39,8 @@ static const char *program_name;
 static GSettings *settings;
 
 static GtkPaned *w_panel;
+static GtkLabel *w_headline_title;
+static GtkLabel *w_headline_date;
 
 static int model_state;
 
@@ -132,6 +134,10 @@ void update()
 	}
 	model_state = 0;
 
+	feeds = ttrss_get_feeds();
+	if (feeds)
+		ttrs_download_headline_content(feeds);
+
 	log_debug("update() done");
 }
 
@@ -160,7 +166,7 @@ void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
 	log_debug("refresh_clicked_cbk() done");
 }
 
-void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
+void preferences_action_activate_cbk(GtkAction *action, gpointer data)
 {
 	GtkDialog *diag;
 	GtkBuilder *builder;
@@ -326,7 +332,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	struct headline *headline;
-	char *str, *tmp;
+	char *str;
 
 	log_debug("headline_cursor_changed_cbk()");
 
@@ -336,22 +342,19 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	headline = get_selected_headline(&iter);
 
 	if (headline) {
-		tmp = ttrss_get_headline_content(headline);
-
-		if (tmp) {
-			str = g_strdup_printf("<h1><a href='%s'>%s</a></h1>%s",
-					      headline->url,
-					      headline->title,
-					      tmp);
-			free(tmp);
-			
+		gtk_label_set_text(w_headline_title, headline->title);
+		gtk_label_set_text(w_headline_date, ctime(&headline->date));
+
+
+		str = ttrss_get_headline_content(headline);
+
+		if (str) {
 			web_load(str);
 			free(str);
 		} else {
 			web_load("");
 		}
 
-		
 		if (headline->unread) {
 			ttrss_set_article_unread(headline->id, 0);
 			headline->unread = 0;
@@ -360,7 +363,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		model = gtk_tree_view_get_model(w_headlinetree);
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
-				   0, headline->title,
+				   COL_HEADLINE_TITLE, headline->title,
 				   -1);
 	} else {
 		log_debug("headline not found");
@@ -505,7 +508,6 @@ int main(int argc, char **argv)
 
 	log_init();
 
-	http_init();
 	ws_init();
 
 	gtk_init(NULL, NULL);
@@ -528,6 +530,10 @@ int main(int argc, char **argv)
 							      "headline_tree"));
 
 	w_panel = GTK_PANED(gtk_builder_get_object(builder, "paned2"));
+	w_headline_title
+		= GTK_LABEL(gtk_builder_get_object(builder, "headline_title"));
+	w_headline_date
+		= GTK_LABEL(gtk_builder_get_object(builder, "headline_date"));
 
 	gtk_builder_connect_signals(builder, NULL);