X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=fa5e38a028c96ea846b89393c3fa2b6e83d97a17;hp=59f3999d8bce5fc8af7de3b32831fe6c27d6d15e;hb=09bcceb88ae4a548c573098fc35a884fe0cc96ad;hpb=c15a1b330bc1435c92221214108e398fd9dc1271 diff --git a/src/main.c b/src/main.c index 59f3999..fa5e38a 100644 --- a/src/main.c +++ b/src/main.c @@ -110,32 +110,34 @@ 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); @@ -291,7 +293,7 @@ static char *headline_get_date(struct headline *h) char date[200]; tmp = localtime(&h->date); - + if (h->unread) strftime(date, sizeof(date), "%D", tmp); else @@ -360,7 +362,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()"); @@ -373,7 +375,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) { @@ -389,10 +390,13 @@ 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, -1); + g_free(date); } else { log_debug("headline not found"); }