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

diff --git a/src/main.c b/src/main.c
index 4365e11..73d537d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -112,7 +112,7 @@ 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 +125,26 @@ 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"));
-
-	e = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry"));
-	gtk_entry_set_text(e, g_settings_get_string(settings, "user"));
-
-	e = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
-	gtk_entry_set_text(e, g_settings_get_string(settings, "password"));
-
-	printf("%d\n", gtk_dialog_run(diag));
+	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"));
+
+	pwd = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
+	gtk_entry_set_text(pwd, 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));
+	}
 
 	gtk_widget_destroy(GTK_WIDGET(diag));
 
@@ -164,7 +174,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 +192,8 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 					   -1);
 
 			free(title);
+
+			headlines++;
 		}
 
 		gtk_tree_path_free(path);