{
GtkDialog *diag;
GtkBuilder *builder;
- GtkEntry *e;
+ GtkEntry *login, *url, *pwd;
printf("settings_activate_cbk\n");
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));
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)
-1);
free(title);
+
+ headlines++;
}
gtk_tree_path_free(path);