projects
/
prss.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[prss.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
59f3999
..
e122bfa
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-52,7
+52,8
@@
enum {
enum {
COL_HEADLINE_TITLE,
COL_HEADLINE_ID,
enum {
COL_HEADLINE_TITLE,
COL_HEADLINE_ID,
- COL_HEADLINE_DATE
+ COL_HEADLINE_DATE,
+ COL_HEADLINE_EPOCH_TIME
};
static struct option long_options[] = {
};
static struct option long_options[] = {
@@
-110,32
+111,34
@@
static char *feed_get_formated_title(struct feed *f)
void update()
{
void update()
{
- struct feed **feeds;
- Gtk
TreeModel
*model, *headline_model;
+ struct feed **feeds
, **cur
;
+ Gtk
ListStore
*model, *headline_model;
GtkTreeIter iter;
char *title;
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;
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();
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,
&iter,
COL_FEED_TITLE, title,
- COL_FEED_ID, (*
feeds
)->id,
+ COL_FEED_ID, (*
cur
)->id,
-1);
g_free(title);
-1);
g_free(title);
-
feeds
++;
+
cur
++;
}
ttrs_download_headline_content(feeds);
}
ttrs_download_headline_content(feeds);
@@
-291,7
+294,7
@@
static char *headline_get_date(struct headline *h)
char date[200];
tmp = localtime(&h->date);
char date[200];
tmp = localtime(&h->date);
-
+
if (h->unread)
strftime(date, sizeof(date), "<b>%D</b>", tmp);
else
if (h->unread)
strftime(date, sizeof(date), "<b>%D</b>", tmp);
else
@@
-340,6
+343,8
@@
int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
h->id,
COL_HEADLINE_DATE,
date,
h->id,
COL_HEADLINE_DATE,
date,
+ COL_HEADLINE_EPOCH_TIME,
+ h->date,
-1);
g_free(title);
-1);
g_free(title);
@@
-360,7
+365,7
@@
int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
GtkTreeIter iter;
GtkTreeModel *model;
struct headline *headline;
GtkTreeIter iter;
GtkTreeModel *model;
struct headline *headline;
- char *str;
+ char *str
, *date
;
log_debug("headline_cursor_changed_cbk()");
log_debug("headline_cursor_changed_cbk()");
@@
-373,7
+378,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));
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) {
str = ttrss_get_headline_content(headline);
if (str) {
@@
-389,10
+393,14
@@
int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
}
model = gtk_tree_view_get_model(w_headlinetree);
}
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,
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);
-1);
+ free(date);
} else {
log_debug("headline not found");
}
} else {
log_debug("headline not found");
}