X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=1249e500f3815fffc93e0ed430ef52ce2c3b0178;hp=2661e4a15c2438f2485ffdb3f91bfffc58d3a9ea;hb=d45f439cd06dddb9078e31905ac6b129c56c0f45;hpb=4e47217ca7b179bf07e58ba965d03c2265d09def diff --git a/src/main.c b/src/main.c index 2661e4a..1249e50 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[] = { @@ -114,8 +115,8 @@ void update() 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_tree_view_get_model(w_feedtree); + headline_model = gtk_tree_view_get_model(w_headlinetree); log_debug("update(): clear feed tree."); model_state = 1; @@ -276,14 +277,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 +327,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 +373,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) {