(no commit message)

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 59f3999..64dfbe8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -110,32 +110,34 @@ static char *feed_get_formated_title(struct feed *f)
 
 void update()
 {
-       struct feed **feeds;
-       GtkTreeModel *model, *headline_model;
+       struct feed **feeds, **cur;
+       GtkListStore *model, *headline_model;
        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;
-       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();
-       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,
-                                  COL_FEED_ID, (*feeds)->id,
+                                  COL_FEED_ID, (*cur)->id,
                                   -1);
                g_free(title);
-               feeds++;
+               cur++;
        }
 
        ttrs_download_headline_content(feeds);
@@ -291,7 +293,7 @@ static char *headline_get_date(struct headline *h)
        char date[200];
 
        tmp = localtime(&h->date);
-       
+
        if (h->unread)
                strftime(date, sizeof(date), "<b>%D</b>", tmp);
        else
@@ -373,7 +375,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));
 
-
                str = ttrss_get_headline_content(headline);
 
                if (str) {