X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=4d180bc90c5d22249173fffd017bbfff06cc5eda;hb=31f62874654f7fd89e362616db13008f7bfc236a;hp=fd04ce59ed1520e1ce62caaab2b1d9c238df310f;hpb=ae4284cdb2445a16b5fd872af089b7d41d585c69;p=prss.git

diff --git a/src/main.c b/src/main.c
index fd04ce5..4d180bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,6 +40,11 @@ enum {
 	COL_FEED_ID
 };
 
+enum {
+	COL_HEADLINE_TITLE,
+	COL_HEADLINE_ID
+};
+
 static struct option long_options[] = {
 	{"version", no_argument, 0, 'v'},
 	{"help", no_argument, 0, 'h'},
@@ -76,22 +81,23 @@ static void print_help()
 	printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
-GtkTreeView *w_treeview;
-GtkTreeView *w_headlineview;
+GtkTreeView *w_feedtree;
+GtkTreeView *w_headlinetree;
 
 void update()
 {
 	struct feed **feeds;
-	GtkTreeModel *model;
+	GtkTreeModel *model, *headlinemodel;
 	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));
-	gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(w_headlineview)));
+	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) {
@@ -177,10 +183,10 @@ static struct feed *get_selected_feed()
 	GtkTreeModel *model;
 	int id;
 
-	gtk_tree_view_get_cursor(w_treeview, &path, &cols);
+	gtk_tree_view_get_cursor(w_feedtree, &path, &cols);
 
 	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);
 
@@ -199,10 +205,10 @@ static struct headline *get_selected_headline(GtkTreeIter *iter)
 	GtkTreeModel *model;
 	int id;
 
-	gtk_tree_view_get_cursor(w_headlineview, &path, &cols);
+	gtk_tree_view_get_cursor(w_headlinetree, &path, &cols);
 
 	if (path) {
-		model = gtk_tree_view_get_model(w_headlineview);
+		model = gtk_tree_view_get_model(w_headlinetree);
 		gtk_tree_model_get_iter(model, iter, path);
 		gtk_tree_model_get(model, iter, 1, &id, -1);
 
@@ -231,7 +237,7 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	feed = get_selected_feed();
 
 	if (feed) {
-		headline_model = gtk_tree_view_get_model(w_headlineview);
+		headline_model = gtk_tree_view_get_model(w_headlinetree);
 		headline_store = GTK_LIST_STORE(headline_model);
 		model_state = 1;
 		gtk_list_store_clear(headline_store);
@@ -240,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++;
 			}
 		}
@@ -293,15 +299,14 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 			headline->unread = 0;
 		}
 
-		model = gtk_tree_view_get_model(w_headlineview);
+		model = gtk_tree_view_get_model(w_headlinetree);
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
 				   0, headline->title,
 				   -1);
 	} else {
 		printf("headline not found\n");
-	}		
-
+	}
 
 	return TRUE;
 }
@@ -319,23 +324,23 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
 
 	printf("headline_row_activated_cbk\n");
 
-	selection = gtk_tree_view_get_selection(w_headlineview);
-	model = gtk_tree_view_get_model(w_headlineview);
+	selection = gtk_tree_view_get_selection(w_headlinetree);
+	model = gtk_tree_view_get_model(w_headlinetree);
 
 	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))
-			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);
 		}
 	}
@@ -404,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"));
-	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder,
+	w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
 							  "feed_tree"));
-	w_headlineview = GTK_TREE_VIEW(gtk_builder_get_object(builder,
+	w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
 							      "headline_tree"));
 
 	gtk_builder_connect_signals(builder, NULL);