#include <getopt.h>
#include <json/json.h>
-#include "ttrss.h"
#include <webkit/webkit.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "phttp.h"
+#include "http.h"
+#include "ttrss.h"
#include "webbrowser.h"
static const char *program_name;
GtkTreeIter iter;
char *title;
- ttrss_login(g_settings_get_string(settings, "url"),
- g_settings_get_string(settings, "user"),
- g_settings_get_string(settings, "password"));
+ ws_init(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));
gtk_list_store_clear(GTK_LIST_STORE(model));
printf("update(): clear feed tree done\n");
feeds = ttrss_get_feeds();
- while(feeds && *feeds) {
+ while (feeds && *feeds) {
if ((*feeds)->unread)
title = g_strdup_printf("<b>%s (%d)</b>",
(*feeds)->title,
(*feeds)->unread);
else
title = strdup((*feeds)->title);
-
+
gtk_list_store_append(GTK_LIST_STORE(model), &iter);
if (gtk_dialog_run(diag)) {
g_settings_set_string(settings,
- "password",
+ "password",
gtk_entry_get_text(pwd));
g_settings_set_string(settings,
- "url",
+ "url",
gtk_entry_get_text(url));
g_settings_set_string(settings,
- "user",
+ "user",
gtk_entry_get_text(login));
update();
const char *str;
printf("headline_cursor_changed_cbk\n");
-
+
if (model_state)
return TRUE;
gtk_tree_model_get(model, &iter, 1, &feed, -1);
url = feed->url;
- if (gtk_widget_has_screen (widget))
+ if (gtk_widget_has_screen(widget))
screen = gtk_widget_get_screen(widget);
else
screen = gdk_screen_get_default();
-
+
printf("%s\n", url);
error = NULL;
exit(EXIT_FAILURE);
}
- phttp_init();
+ http_init();
gtk_init(NULL, NULL);
settings = g_settings_new("prss");