(no commit message)

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 73d537d..79b94f7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -85,9 +85,10 @@ void update()
                    g_settings_get_string(settings, "password"));
 
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
-       gtk_list_store_clear(GTK_LIST_STORE(model));
 
-       for (feeds = ttrss_get_feeds(); *feeds; feeds++) {
+       gtk_list_store_clear(GTK_LIST_STORE(model));
+       feeds = ttrss_get_feeds();
+       while(feeds && *feeds) {
                if ((*feeds)->unread)
                        title = g_strdup_printf("<b>%s (%d)</b>",
                                                (*feeds)->title,
@@ -104,10 +105,17 @@ void update()
                                   1, (*feeds),
                                   -1);
                free(title);
+               feeds++;
        }
        printf("refresh done\n");
 }
 
+void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
+{
+       printf("refresh_clicked_cbk\n");
+       update();
+}
+
 void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 {
        GtkDialog *diag;
@@ -204,13 +212,14 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
-       printf("headline_cursor_changed_cbk\n");
-
        GtkTreePath *path;
        GtkTreeViewColumn *cols;
        GtkTreeIter iter;
        GtkTreeModel *model;
        struct headline *headline;
+       const char *str;
+
+       printf("headline_cursor_changed_cbk\n");
 
        gtk_tree_view_get_cursor(treeview, &path, &cols);
 
@@ -219,7 +228,12 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                gtk_tree_model_get_iter(model, &iter, path);
                gtk_tree_model_get(model, &iter, 1, &headline, -1);
 
-               web_load(((struct headline *)headline)->content);
+               str = ttrss_get_headline_content((struct headline *)headline);
+
+               if (str)
+                       web_load(str);
+               else
+                       web_load("");
 
                gtk_tree_path_free(path);
        }
@@ -300,8 +314,6 @@ int main(int argc, char **argv)
 
        gtk_widget_show_all(window);
 
-       update();
-
        gtk_main();
 
        exit(EXIT_SUCCESS);