X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=b7a2e65632178819e8124d1743f4b49d55ab6fc8;hp=2661e4a15c2438f2485ffdb3f91bfffc58d3a9ea;hb=6ccb17c2d686381c564a33e84962199ef3e4019f;hpb=4e47217ca7b179bf07e58ba965d03c2265d09def
diff --git a/src/main.c b/src/main.c
index 2661e4a..b7a2e65 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,7 +51,8 @@ enum {
enum {
COL_HEADLINE_TITLE,
- COL_HEADLINE_ID
+ COL_HEADLINE_ID,
+ COL_HEADLINE_DATE
};
static struct option long_options[] = {
@@ -110,25 +111,26 @@ static char *feed_get_formated_title(struct feed *f)
void update()
{
struct feed **feeds;
- GtkTreeModel *model, *headline_model;
+ 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);
- 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,
@@ -276,14 +278,37 @@ static struct headline *get_selected_headline(GtkTreeIter *iter)
return NULL;
}
+static char *headline_get_formated_headline(struct headline *h)
+{
+ if (h->unread)
+ return g_strdup_printf("%s", h->title);
+ else
+ return strdup(h->title);
+}
+
+static char *headline_get_date(struct headline *h)
+{
+ struct tm *tmp;
+ char date[200];
+
+ tmp = localtime(&h->date);
+
+ if (h->unread)
+ strftime(date, sizeof(date), "%D", tmp);
+ else
+ strftime(date, sizeof(date), "%D", tmp);
+
+ return strdup(date);
+}
+
int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
{
GtkTreeIter iter;
GtkTreeModel *headline_model;
GtkListStore *headline_store;
struct feed *feed;
- struct headline **headlines;
- char *title;
+ struct headline **headlines, *h;
+ char *title, *date;
if (model_state)
return TRUE;
@@ -303,22 +328,23 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
while (headlines && *headlines) {
gtk_list_store_append(headline_store, &iter);
- if ((*headlines)->unread)
- title = g_strdup_printf
- ("%s",
- (*headlines)->title);
- else
- title = strdup((*headlines)->title);
+ h = *headlines;
+
+ title = headline_get_formated_headline(h);
+ date = headline_get_date(h);
gtk_list_store_set(headline_store,
&iter,
COL_HEADLINE_TITLE,
title,
COL_HEADLINE_ID,
- (*headlines)->id,
+ h->id,
+ COL_HEADLINE_DATE,
+ date,
-1);
- free(title);
+ g_free(title);
+ free(date);
headlines++;
}
@@ -348,7 +374,6 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
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) {