X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=1518bd618e1be511401b273d3cdbc569b4269530;hb=e986bbe93fab2d002797bf40983d91ceb76a133c;hp=a38238d7985406039fb34376c104c896315e3761;hpb=4e797ddad1e3df3bfdb4fbe8266e6961562fab23;p=prss.git

diff --git a/src/main.c b/src/main.c
index a38238d..1518bd6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -52,7 +52,8 @@ enum {
 enum {
 	COL_HEADLINE_TITLE,
 	COL_HEADLINE_ID,
-	COL_HEADLINE_DATE
+	COL_HEADLINE_DATE,
+	COL_HEADLINE_EPOCH_TIME
 };
 
 static struct option long_options[] = {
@@ -110,35 +111,38 @@ static char *feed_get_formated_title(struct feed *f)
 
 void update()
 {
-	struct feed **feeds;
-	GtkTreeModel *model, *headline_model;
+	struct feed **feeds, **cur;
+	GtkListStore *model, *headline_model;
 	GtkTreeIter iter;
 	char *title;
 
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_feedtree));
-	headline_model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_headlinetree));
+	model = GTK_LIST_STORE(gtk_tree_view_get_model(w_feedtree));
+	headline_model
+		= GTK_LIST_STORE(gtk_tree_view_get_model(w_headlinetree));
 
 	log_debug("update(): clear feed tree.");
 	model_state = 1;
-	gtk_list_store_clear(GTK_LIST_STORE(model));
-	gtk_list_store_clear(GTK_LIST_STORE(headline_model));
+	gtk_list_store_clear(model);
+	gtk_list_store_clear(headline_model);
 	log_debug("update(): clear feed tree done.");
 	feeds = ttrss_get_feeds();
-	while (feeds && *feeds) {
-		title = feed_get_formated_title(*feeds);
+	cur = feeds;
+	while (cur && *cur) {
+		title = feed_get_formated_title(*cur);
 
-		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+		gtk_list_store_append(model, &iter);
 
-		gtk_list_store_set(GTK_LIST_STORE(model),
+		gtk_list_store_set(model,
 				   &iter,
 				   COL_FEED_TITLE, title,
-				   COL_FEED_ID, (*feeds)->id,
+				   COL_FEED_ID, (*cur)->id,
 				   -1);
 		g_free(title);
-		feeds++;
+		cur++;
 	}
 
-	ttrs_download_headline_content(feeds);
+	if (feeds)
+		ttrs_download_headline_content(feeds);
 
 	model_state = 0;
 
@@ -291,7 +295,7 @@ static char *headline_get_date(struct headline *h)
 	char date[200];
 
 	tmp = localtime(&h->date);
-	
+
 	if (h->unread)
 		strftime(date, sizeof(date), "<b>%D</b>", tmp);
 	else
@@ -340,6 +344,8 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 						   h->id,
 						   COL_HEADLINE_DATE,
 						   date,
+						   COL_HEADLINE_EPOCH_TIME,
+						   h->date,
 						   -1);
 
 				g_free(title);
@@ -360,7 +366,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	struct headline *headline;
-	char *str;
+	char *str, *date;
 
 	log_debug("headline_cursor_changed_cbk()");
 
@@ -388,10 +394,14 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		}
 
 		model = gtk_tree_view_get_model(w_headlinetree);
+		date = headline_get_date(headline);
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
 				   COL_HEADLINE_TITLE, headline->title,
+				   COL_HEADLINE_DATE, date,
+				   COL_HEADLINE_EPOCH_TIME, headline->date,
 				   -1);
+		free(date);
 	} else {
 		log_debug("headline not found");
 	}