projects
/
prss.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b227ac2
)
(no commit message)
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 25 Apr 2013 07:21:03 +0000
(07:21 +0000)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 25 Apr 2013 07:21:03 +0000
(07:21 +0000)
src/main.c
patch
|
blob
|
history
diff --git
a/src/main.c
b/src/main.c
index
6d52b05
..
91eb0dc
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-81,8
+81,8
@@
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()
{
void update()
{
@@
-91,12
+91,12
@@
void update()
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_headline
view
)));
+ gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(w_headline
tree
)));
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) {
@@
-182,10
+182,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);
@@
-204,10
+204,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);
@@
-236,7
+236,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);
@@
-298,7
+298,7
@@
int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
headline->unread = 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,
gtk_list_store_set(GTK_LIST_STORE(model),
&iter,
0, headline->title,
@@
-324,14
+324,14
@@
void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
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)) {
gtk_tree_model_get(model, &iter, 1, &id, -1);
h = ttrss_get_headline(id);
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
gtk_tree_model_get(model, &iter, 1, &id, -1);
h = ttrss_get_headline(id);
- if (
feed
) {
+ if (
h
) {
url = h->url;
if (gtk_widget_has_screen(widget))
url = h->url;
if (gtk_widget_has_screen(widget))
@@
-409,9
+409,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);