X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=861309ddc40f32fbcde2a577db16e2034a95a338;hp=4365e11230b8d542f41b91c611ae419fd508cb7d;hb=fd2d79da502acb8dcb4589413b7f529c762997f1;hpb=646cde735b54f33fd935535c97bace0d9971beb6

diff --git a/src/main.c b/src/main.c
index 4365e11..861309d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -85,9 +85,10 @@ void update()
 		    g_settings_get_string(settings, "password"));
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
-	gtk_list_store_clear(GTK_LIST_STORE(model));
 
-	for (feeds = ttrss_get_feeds(); *feeds; feeds++) {
+	gtk_list_store_clear(GTK_LIST_STORE(model));
+	feeds = ttrss_get_feeds();
+	while(feeds && *feeds) {
 		if ((*feeds)->unread)
 			title = g_strdup_printf("<b>%s (%d)</b>",
 						(*feeds)->title,
@@ -104,15 +105,22 @@ void update()
 				   1, (*feeds),
 				   -1);
 		free(title);
+		feeds++;
 	}
 	printf("refresh done\n");
 }
 
+void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
+{
+	printf("refresh_clicked_cbk\n");
+	update();
+}
+
 void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 {
 	GtkDialog *diag;
 	GtkBuilder *builder;
-	GtkEntry *e;
+	GtkEntry *login, *url, *pwd;
 
 	printf("settings_activate_cbk\n");
 
@@ -125,16 +133,28 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 
 	diag = GTK_DIALOG(gtk_builder_get_object(builder, "settings_dialog"));
 
-	e = GTK_ENTRY(gtk_builder_get_object(builder, "url_entry"));
-	gtk_entry_set_text(e, g_settings_get_string(settings, "url"));
+	url = GTK_ENTRY(gtk_builder_get_object(builder, "url_entry"));
+	gtk_entry_set_text(url, g_settings_get_string(settings, "url"));
+
+	login = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry"));
+	gtk_entry_set_text(login, g_settings_get_string(settings, "user"));
 
-	e = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry"));
-	gtk_entry_set_text(e, g_settings_get_string(settings, "user"));
+	pwd = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
+	gtk_entry_set_text(pwd, g_settings_get_string(settings, "password"));
 
-	e = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
-	gtk_entry_set_text(e, g_settings_get_string(settings, "password"));
+	if (gtk_dialog_run(diag)) {
+		g_settings_set_string(settings,
+				      "password", 
+				      gtk_entry_get_text(pwd));
+		g_settings_set_string(settings,
+				      "url", 
+				      gtk_entry_get_text(url));
+		g_settings_set_string(settings,
+				      "user", 
+				      gtk_entry_get_text(login));
 
-	printf("%d\n", gtk_dialog_run(diag));
+		update();
+	}
 
 	gtk_widget_destroy(GTK_WIDGET(diag));
 
@@ -164,7 +184,9 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		headline_model = gtk_tree_view_get_model(w_headlineview);
 		headline_store = GTK_LIST_STORE(headline_model);
 		gtk_list_store_clear(headline_store);
-		for (headlines = feed->headlines; *headlines; headlines++) {
+
+		headlines = ttrss_get_headlines(feed);
+		while (headlines && *headlines) {
 			gtk_list_store_append(headline_store, &iter);
 
 			if ((*headlines)->unread)
@@ -180,6 +202,8 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 					   -1);
 
 			free(title);
+
+			headlines++;
 		}
 
 		gtk_tree_path_free(path);
@@ -190,13 +214,14 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
-	printf("headline_cursor_changed_cbk\n");
-
 	GtkTreePath *path;
 	GtkTreeViewColumn *cols;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	struct headline *headline;
+	const char *str;
+
+	printf("headline_cursor_changed_cbk\n");
 
 	gtk_tree_view_get_cursor(treeview, &path, &cols);
 
@@ -205,7 +230,12 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		gtk_tree_model_get_iter(model, &iter, path);
 		gtk_tree_model_get(model, &iter, 1, &headline, -1);
 
-		web_load(((struct headline *)headline)->content);
+		str = ttrss_get_headline_content((struct headline *)headline);
+
+		if (str)
+			web_load(str);
+		else
+			web_load("");
 
 		gtk_tree_path_free(path);
 	}
@@ -213,6 +243,37 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	return TRUE;
 }
 
+void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
+{
+	GdkScreen *screen;
+	GError *error;
+	GtkTreeSelection *selection;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	struct feed *feed;
+	const char *url;
+
+	printf("headline_row_activated_cbk\n");
+
+	selection = gtk_tree_view_get_selection(w_headlineview);
+	model = gtk_tree_view_get_model(w_headlineview);
+
+	if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+		gtk_tree_model_get(model, &iter, 1, &feed, -1);
+		url = feed->url;
+
+		if (gtk_widget_has_screen (widget))
+			screen = gtk_widget_get_screen(widget);
+		else
+			screen = gdk_screen_get_default();
+		
+		printf("%s\n", url);
+
+		error = NULL;
+		gtk_show_uri(screen, url, gtk_get_current_event_time(), &error);
+	}
+}
+
 gboolean
 window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
@@ -286,8 +347,6 @@ int main(int argc, char **argv)
 
 	gtk_widget_show_all(window);
 
-	update();
-
 	gtk_main();
 
 	exit(EXIT_SUCCESS);