(no commit message)

diff --git a/src/http.c b/src/http.c
index 99afa01..43053ed 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -28,7 +28,7 @@
 
 #include "http.h"
 
 
 #include "http.h"
 

-static int debug = 0;
+static int debug;

 
 struct ucontent {
        char *data;
 
 struct ucontent {
        char *data;

diff --git a/src/main.c b/src/main.c
index 91eb0dc..4d180bc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -87,7 +87,7 @@ GtkTreeView *w_headlinetree;
 void update()
 {
        struct feed **feeds;
 void update()
 {
        struct feed **feeds;

-       GtkTreeModel *model;
+       GtkTreeModel *model, *headlinemodel;

        GtkTreeIter iter;
        char *title;
 
        GtkTreeIter iter;
        char *title;
 


@@ -96,7 +96,8 @@ void update()
        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_headlinetree)));
+       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) {


@@ -245,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++;
                        }
                }


@@ -305,8 +306,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                                   -1);
        } else {
                printf("headline not found\n");
                                   -1);
        } else {
                printf("headline not found\n");

-       }               
-
+       }

 
        return TRUE;
 }
 
        return TRUE;
 }


@@ -333,14 +333,14 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
                h = ttrss_get_headline(id);
                if (h) {
                        url = h->url;
                h = ttrss_get_headline(id);
                if (h) {
                        url = h->url;

-                       
+

                        if (gtk_widget_has_screen(widget))
                        if (gtk_widget_has_screen(widget))

-                       screen = gtk_widget_get_screen(widget);
+                               screen = gtk_widget_get_screen(widget);

                        else
                                screen = gdk_screen_get_default();
                        else
                                screen = gdk_screen_get_default();

-                       
+

                        error = NULL;
                        error = NULL;

-                       gtk_show_uri(screen, url, 
+                       gtk_show_uri(screen, url,

                                     gtk_get_current_event_time(), &error);
                }
        }
                                     gtk_get_current_event_time(), &error);
                }
        }

diff --git a/src/ttrss.c b/src/ttrss.c
index 72dabdb..2a73d64 100644 (file)
--- a/src/ttrss.c
+++ b/src/ttrss.c
@@ -63,19 +63,19 @@ const char *ttrss_get_headline_content(struct headline *h)
 {
        const char *cache_dir;
        char *path, *content;
 {
        const char *cache_dir;
        char *path, *content;

-       
+

        if (!h->content) {
                cache_dir = get_cache_dir();
                if (cache_dir) {
                        path = g_strdup_printf("%s/%d", cache_dir, h->id);
        if (!h->content) {
                cache_dir = get_cache_dir();
                if (cache_dir) {
                        path = g_strdup_printf("%s/%d", cache_dir, h->id);

-                       
+

                        content = file_get_content(path);
                        content = file_get_content(path);

-                       
+

                        if (content) {
                                h->content = content;
                        } else {
                                h->content = ws_get_article_content(h->id);
                        if (content) {
                                h->content = content;
                        } else {
                                h->content = ws_get_article_content(h->id);

-                               
+

                                if (h->content)
                                        file_set_content(path, h->content);
                        }
                                if (h->content)
                                        file_set_content(path, h->content);
                        }

diff --git a/src/ttrss_model.c b/src/ttrss_model.c
index 93c9409..f08521a 100644 (file)
--- a/src/ttrss_model.c
+++ b/src/ttrss_model.c
@@ -104,7 +104,7 @@ struct headline *headline_new(int id, const char *url, const char *title)
        h->unread = -1;
        h->excerpt = NULL;
        h->content = NULL;
        h->unread = -1;
        h->excerpt = NULL;
        h->content = NULL;

-       
+

        return h;
 }
 
        return h;
 }