From 7f50cedb88527a356ba2deeb15e1e959c58a3f57 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 25 Apr 2013 07:28:29 +0000
Subject: [PATCH]

---
 src/http.c        |  2 +-
 src/main.c        | 24 ++++++++++++------------
 src/ttrss.c       |  8 ++++----
 src/ttrss_model.c |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/http.c b/src/http.c
index 99afa01..43053ed 100644
--- a/src/http.c
+++ b/src/http.c
@@ -28,7 +28,7 @@
 
 #include "http.h"
 
-static int debug = 0;
+static int debug;
 
 struct ucontent {
 	char *data;
diff --git a/src/main.c b/src/main.c
index 91eb0dc..4d180bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -87,7 +87,7 @@ GtkTreeView *w_headlinetree;
 void update()
 {
 	struct feed **feeds;
-	GtkTreeModel *model;
+	GtkTreeModel *model, *headlinemodel;
 	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));
-	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) {
@@ -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);
-				
+
 				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);
-				
+
 				free(title);
-				
+
 				headlines++;
 			}
 		}
@@ -305,8 +306,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 				   -1);
 	} else {
 		printf("headline not found\n");
-	}		
-
+	}
 
 	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;
-			
+
 			if (gtk_widget_has_screen(widget))
-			screen = gtk_widget_get_screen(widget);
+				screen = gtk_widget_get_screen(widget);
 			else
 				screen = gdk_screen_get_default();
-			
+
 			error = NULL;
-			gtk_show_uri(screen, url, 
+			gtk_show_uri(screen, url,
 				     gtk_get_current_event_time(), &error);
 		}
 	}
diff --git a/src/ttrss.c b/src/ttrss.c
index 72dabdb..2a73d64 100644
--- 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;
-	
+
 	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);
-			
+
 			if (content) {
 				h->content = content;
 			} else {
 				h->content = ws_get_article_content(h->id);
-				
+
 				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
--- 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;
-	
+
 	return h;
 }
 
-- 
2.7.4