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
f227b41
..
5b23720
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-40,6
+40,11
@@
enum {
COL_FEED_ID
};
COL_FEED_ID
};
+enum {
+ COL_HEADLINE_TITLE,
+ COL_HEADLINE_ID
+};
+
static struct option long_options[] = {
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
static struct option long_options[] = {
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
@@
-76,22
+81,23
@@
static void print_help()
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
-GtkTreeView *w_
treeview
;
-GtkTreeView *w_headline
view
;
+GtkTreeView *w_
feedtree
;
+GtkTreeView *w_headline
tree
;
void update()
{
struct feed **feeds;
void update()
{
struct feed **feeds;
- GtkTreeModel *model;
+ GtkTreeModel *model
, *headlinemodel
;
GtkTreeIter iter;
char *title;
GtkTreeIter iter;
char *title;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_
treeview
));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_
feedtree
));
printf("update(): clear feed tree\n");
model_state = 1;
gtk_list_store_clear(GTK_LIST_STORE(model));
printf("update(): clear feed tree\n");
model_state = 1;
gtk_list_store_clear(GTK_LIST_STORE(model));
- gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(w_headlineview)));
+ headlinemodel = gtk_tree_view_get_model(w_headlinetree);
+ gtk_list_store_clear(GTK_LIST_STORE(headlinemodel));
printf("update(): clear feed tree done\n");
feeds = ttrss_get_feeds();
while (feeds && *feeds) {
printf("update(): clear feed tree done\n");
feeds = ttrss_get_feeds();
while (feeds && *feeds) {
@@
-177,10
+183,10
@@
static struct feed *get_selected_feed()
GtkTreeModel *model;
int id;
GtkTreeModel *model;
int id;
- gtk_tree_view_get_cursor(w_
treeview
, &path, &cols);
+ gtk_tree_view_get_cursor(w_
feedtree
, &path, &cols);
if (path) {
if (path) {
- model = gtk_tree_view_get_model(w_
treeview
);
+ model = gtk_tree_view_get_model(w_
feedtree
);
gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, 1, &id, -1);
gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, 1, &id, -1);
@@
-199,10
+205,10
@@
static struct headline *get_selected_headline(GtkTreeIter *iter)
GtkTreeModel *model;
int id;
GtkTreeModel *model;
int id;
- gtk_tree_view_get_cursor(w_headline
view
, &path, &cols);
+ gtk_tree_view_get_cursor(w_headline
tree
, &path, &cols);
if (path) {
if (path) {
- model = gtk_tree_view_get_model(w_headline
view
);
+ model = gtk_tree_view_get_model(w_headline
tree
);
gtk_tree_model_get_iter(model, iter, path);
gtk_tree_model_get(model, iter, 1, &id, -1);
gtk_tree_model_get_iter(model, iter, path);
gtk_tree_model_get(model, iter, 1, &id, -1);
@@
-231,7
+237,7
@@
int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
feed = get_selected_feed();
if (feed) {
feed = get_selected_feed();
if (feed) {
- headline_model = gtk_tree_view_get_model(w_headline
view
);
+ headline_model = gtk_tree_view_get_model(w_headline
tree
);
headline_store = GTK_LIST_STORE(headline_model);
model_state = 1;
gtk_list_store_clear(headline_store);
headline_store = GTK_LIST_STORE(headline_model);
model_state = 1;
gtk_list_store_clear(headline_store);
@@
-240,22
+246,22
@@
int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
headlines = ttrss_feed_get_headlines(feed);
while (headlines && *headlines) {
gtk_list_store_append(headline_store, &iter);
headlines = ttrss_feed_get_headlines(feed);
while (headlines && *headlines) {
gtk_list_store_append(headline_store, &iter);
-
+
if ((*headlines)->unread)
title = g_strdup_printf
("<b>%s</b>",
(*headlines)->title);
else
title = strdup((*headlines)->title);
if ((*headlines)->unread)
title = g_strdup_printf
("<b>%s</b>",
(*headlines)->title);
else
title = strdup((*headlines)->title);
-
+
gtk_list_store_set(headline_store,
&iter,
0, title,
1, (*headlines)->id,
-1);
gtk_list_store_set(headline_store,
&iter,
0, title,
1, (*headlines)->id,
-1);
-
+
free(title);
free(title);
-
+
headlines++;
}
}
headlines++;
}
}
@@
-271,7
+277,7
@@
int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
GtkTreeIter iter;
GtkTreeModel *model;
struct headline *headline;
GtkTreeIter iter;
GtkTreeModel *model;
struct headline *headline;
- c
onst c
har *str;
+ char *str;
printf("headline_cursor_changed_cbk\n");
printf("headline_cursor_changed_cbk\n");
@@
-288,20
+294,21
@@
int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
else
web_load("");
else
web_load("");
+ free(str);
+
if (headline->unread) {
ttrss_set_article_unread(headline->id, 0);
headline->unread = 0;
}
if (headline->unread) {
ttrss_set_article_unread(headline->id, 0);
headline->unread = 0;
}
- model = gtk_tree_view_get_model(w_headline
view
);
+ model = gtk_tree_view_get_model(w_headline
tree
);
gtk_list_store_set(GTK_LIST_STORE(model),
&iter,
0, headline->title,
-1);
} else {
printf("headline not found\n");
gtk_list_store_set(GTK_LIST_STORE(model),
&iter,
0, headline->title,
-1);
} else {
printf("headline not found\n");
- }
-
+ }
return TRUE;
}
return TRUE;
}
@@
-313,25
+320,31
@@
void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
- struct
feed *feed
;
+ struct
headline *h
;
const char *url;
const char *url;
+ int id;
printf("headline_row_activated_cbk\n");
printf("headline_row_activated_cbk\n");
- selection = gtk_tree_view_get_selection(w_headline
view
);
- model = gtk_tree_view_get_model(w_headline
view
);
+ selection = gtk_tree_view_get_selection(w_headline
tree
);
+ model = gtk_tree_view_get_model(w_headline
tree
);
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
- gtk_tree_model_get(model, &iter, 1, &feed, -1);
- url = feed->url;
+ gtk_tree_model_get(model, &iter, 1, &id, -1);
- if (gtk_widget_has_screen(widget))
- screen = gtk_widget_get_screen(widget);
- else
- screen = gdk_screen_get_default();
+ h = ttrss_get_headline(id);
+ if (h) {
+ url = h->url;
- error = NULL;
- gtk_show_uri(screen, url, gtk_get_current_event_time(), &error);
+ if (gtk_widget_has_screen(widget))
+ screen = gtk_widget_get_screen(widget);
+ else
+ screen = gdk_screen_get_default();
+
+ error = NULL;
+ gtk_show_uri(screen, url,
+ gtk_get_current_event_time(), &error);
+ }
}
}
}
}
@@
-398,9
+411,9
@@
int main(int argc, char **argv)
PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
NULL);
window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
NULL);
window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
- w_
treeview
= GTK_TREE_VIEW(gtk_builder_get_object(builder,
+ w_
feedtree
= GTK_TREE_VIEW(gtk_builder_get_object(builder,
"feed_tree"));
"feed_tree"));
- w_headline
view
= GTK_TREE_VIEW(gtk_builder_get_object(builder,
+ w_headline
tree
= GTK_TREE_VIEW(gtk_builder_get_object(builder,
"headline_tree"));
gtk_builder_connect_signals(builder, NULL);
"headline_tree"));
gtk_builder_connect_signals(builder, NULL);