X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=5b237208b5cffbf0446539e996992c0b518b8163;hp=d3f134b0f203b48e4492fd7ad107bb62e04dfe14;hb=ba998dd7b5a61fc2a1fa25538dc370eff0368c2c;hpb=4e8c884a282bcf16f486d06164ee187faa8a2610

diff --git a/src/main.c b/src/main.c
index d3f134b..5b23720 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,6 +35,16 @@ static GSettings *settings;
 
 static int model_state;
 
+enum {
+	COL_FEED_TITLE,
+	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'},
@@ -71,27 +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;
 
-	ttrss_set_config(g_settings_get_string(settings, "url"),
-			 g_settings_get_string(settings, "user"),
-			 g_settings_get_string(settings, "password"));
-	ws_open_session();
-
-	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) {
@@ -108,7 +114,7 @@ void update()
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
 				   0, title,
-				   1, (*feeds),
+				   1, (*feeds)->id,
 				   -1);
 		free(title);
 		feeds++;
@@ -169,12 +175,55 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 	g_object_unref(G_OBJECT(builder));
 }
 
-int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
+static struct feed *get_selected_feed()
 {
 	GtkTreePath *path;
 	GtkTreeViewColumn *cols;
 	GtkTreeIter iter;
-	GtkTreeModel *model, *headline_model;
+	GtkTreeModel *model;
+	int id;
+
+	gtk_tree_view_get_cursor(w_feedtree, &path, &cols);
+
+	if (path) {
+		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);
+
+		gtk_tree_path_free(path);
+
+		return ttrss_get_feed(id);
+	}
+
+	return NULL;
+}
+
+static struct headline *get_selected_headline(GtkTreeIter *iter)
+{
+	GtkTreePath *path;
+	GtkTreeViewColumn *cols;
+	GtkTreeModel *model;
+	int id;
+
+	gtk_tree_view_get_cursor(w_headlinetree, &path, &cols);
+
+	if (path) {
+		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);
+
+		gtk_tree_path_free(path);
+
+		return ttrss_get_headline(id);
+	}
+
+	return NULL;
+}
+
+int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *headline_model;
 	GtkListStore *headline_store;
 	struct feed *feed;
 	struct headline **headlines;
@@ -185,41 +234,39 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 	printf("feed_cursor_changed_cbk\n");
 
-	gtk_tree_view_get_cursor(treeview, &path, &cols);
-
-	if (path) {
-		model = gtk_tree_view_get_model(treeview);
-		gtk_tree_model_get_iter(model, &iter, path);
-		gtk_tree_model_get(model, &iter, 1, &feed, -1);
+	feed = get_selected_feed();
 
-		headline_model = gtk_tree_view_get_model(w_headlineview);
+	if (feed) {
+		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);
 
-		headlines = ttrss_feed_get_headlines(feed);
-		while (headlines && *headlines) {
-			gtk_list_store_append(headline_store, &iter);
+		if (feed) {
+			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),
-					   -1);
+				gtk_list_store_set(headline_store,
+						   &iter,
+						   0, title,
+						   1, (*headlines)->id,
+						   -1);
 
-			free(title);
+				free(title);
 
-			headlines++;
+				headlines++;
+			}
 		}
 
 		model_state = 0;
-		gtk_tree_path_free(path);
 	}
 
 	return 1;
@@ -227,25 +274,19 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
-	GtkTreePath *path;
-	GtkTreeViewColumn *cols;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	struct headline *headline;
-	const char *str;
+	char *str;
 
 	printf("headline_cursor_changed_cbk\n");
 
 	if (model_state)
 		return TRUE;
 
-	gtk_tree_view_get_cursor(treeview, &path, &cols);
-
-	if (path) {
-		model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
-		gtk_tree_model_get_iter(model, &iter, path);
-		gtk_tree_model_get(model, &iter, 1, &headline, -1);
+	headline = get_selected_headline(&iter);
 
+	if (headline) {
 		str = ttrss_get_headline_content(headline);
 
 		if (str)
@@ -253,17 +294,20 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		else
 			web_load("");
 
+		free(str);
+
 		if (headline->unread) {
 			ttrss_set_article_unread(headline->id, 0);
 			headline->unread = 0;
 		}
 
+		model = gtk_tree_view_get_model(w_headlinetree);
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
 				   0, headline->title,
 				   -1);
-
-		gtk_tree_path_free(path);
+	} else {
+		printf("headline not found\n");
 	}
 
 	return TRUE;
@@ -276,27 +320,31 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	struct feed *feed;
+	struct headline *h;
 	const char *url;
+	int id;
 
 	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, &feed, -1);
-		url = feed->url;
+		gtk_tree_model_get(model, &iter, 1, &id, -1);
 
-		if (gtk_widget_has_screen(widget))
-			screen = gtk_widget_get_screen(widget);
-		else
-			screen = gdk_screen_get_default();
+		h = ttrss_get_headline(id);
+		if (h) {
+			url = h->url;
 
-		printf("%s\n", url);
+			if (gtk_widget_has_screen(widget))
+				screen = gtk_widget_get_screen(widget);
+			else
+				screen = gdk_screen_get_default();
 
-		error = NULL;
-		gtk_show_uri(screen, url, gtk_get_current_event_time(), &error);
+			error = NULL;
+			gtk_show_uri(screen, url,
+				     gtk_get_current_event_time(), &error);
+		}
 	}
 }
 
@@ -352,15 +400,20 @@ int main(int argc, char **argv)
 	gtk_init(NULL, NULL);
 	settings = g_settings_new("prss");
 
+	ttrss_set_config(g_settings_get_string(settings, "url"),
+			 g_settings_get_string(settings, "user"),
+			 g_settings_get_string(settings, "password"));
+	ws_open_session();
+
 	builder = gtk_builder_new();
 	gtk_builder_add_from_file
 		(builder,
 		 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);