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
bb67679
..
13411c9
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-39,6
+39,8
@@
static const char *program_name;
static GSettings *settings;
static GtkPaned *w_panel;
static GSettings *settings;
static GtkPaned *w_panel;
+static GtkLabel *w_headline_title;
+static GtkLabel *w_headline_date;
static int model_state;
static int model_state;
@@
-160,7
+162,7
@@
void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
log_debug("refresh_clicked_cbk() done");
}
log_debug("refresh_clicked_cbk() done");
}
-void
settings_activate_cbk(GtkWidget *menu_item
, gpointer data)
+void
preferences_action_activate_cbk(GtkAction *action
, gpointer data)
{
GtkDialog *diag;
GtkBuilder *builder;
{
GtkDialog *diag;
GtkBuilder *builder;
@@
-326,7
+328,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
, *tmp
;
+ char *str;
log_debug("headline_cursor_changed_cbk()");
log_debug("headline_cursor_changed_cbk()");
@@
-336,17
+338,15
@@
int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
headline = get_selected_headline(&iter);
if (headline) {
headline = get_selected_headline(&iter);
if (headline) {
- tmp = ttrss_get_headline_content(headline);
+ gtk_label_set_text(w_headline_title, headline->title);
+ gtk_label_set_text(w_headline_date, ctime(&headline->date));
- if (tmp) {
- str = g_strdup_printf("<h1><a href='%s'>%s</a></h1>%s",
- headline->url,
- headline->title,
- tmp);
- free(tmp);
+ str = ttrss_get_headline_content(headline);
+
+ if (str) {
web_load(str);
web_load(str);
-
g_
free(str);
+ free(str);
} else {
web_load("");
}
} else {
web_load("");
}
@@
-359,7
+359,7
@@
int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
model = gtk_tree_view_get_model(w_headlinetree);
gtk_list_store_set(GTK_LIST_STORE(model),
&iter,
model = gtk_tree_view_get_model(w_headlinetree);
gtk_list_store_set(GTK_LIST_STORE(model),
&iter,
-
0
, headline->title,
+
COL_HEADLINE_TITLE
, headline->title,
-1);
} else {
log_debug("headline not found");
-1);
} else {
log_debug("headline not found");
@@
-527,6
+527,10
@@
int main(int argc, char **argv)
"headline_tree"));
w_panel = GTK_PANED(gtk_builder_get_object(builder, "paned2"));
"headline_tree"));
w_panel = GTK_PANED(gtk_builder_get_object(builder, "paned2"));
+ w_headline_title
+ = GTK_LABEL(gtk_builder_get_object(builder, "headline_title"));
+ w_headline_date
+ = GTK_LABEL(gtk_builder_get_object(builder, "headline_date"));
gtk_builder_connect_signals(builder, NULL);
gtk_builder_connect_signals(builder, NULL);