(no commit message)

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index fd0a11f..35c73a5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,8 @@
 #include "webbrowser.h"
 
 static const char *program_name;
 #include "webbrowser.h"
 
 static const char *program_name;

+static GSettings *settings;
+

 
 static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
 
 static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},


@@ -73,16 +75,10 @@ GtkTreeView *w_headlineview;
 
 void update()
 {
 
 void update()
 {

-       GSettings *settings;

        struct feed **feeds;
        GtkTreeModel *model;
        GtkTreeIter iter;
 
        struct feed **feeds;
        GtkTreeModel *model;
        GtkTreeIter iter;
 

-       printf("update\n");
-       phttp_init();
-
-       settings = g_settings_new("prss");
-

        ttrss_login(g_settings_get_string(settings, "url"),
                    g_settings_get_string(settings, "user"),
                    g_settings_get_string(settings, "password"));
        ttrss_login(g_settings_get_string(settings, "url"),
                    g_settings_get_string(settings, "user"),
                    g_settings_get_string(settings, "password"));


@@ -99,11 +95,43 @@ void update()
                                   1, (*feeds),
                                   -1);
 
                                   1, (*feeds),
                                   -1);
 

-               printf("add\n");

        }
        printf("refresh done\n");
 }
 
        }
        printf("refresh done\n");
 }
 

+void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
+{
+       GtkDialog *diag;
+       GtkBuilder *builder;
+       GtkEntry *e;
+
+       printf("settings_activate_cbk\n");
+
+       builder = gtk_builder_new();
+
+       gtk_builder_add_from_file
+               (builder,
+                PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
+                NULL);
+
+       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));
+
+       gtk_widget_destroy(GTK_WIDGET(diag));
+
+       g_object_unref(G_OBJECT(builder));
+}
+

 int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
        GtkTreePath *path;
 int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
        GtkTreePath *path;


@@ -213,7 +241,11 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
                exit(EXIT_FAILURE);
        }
 

+       phttp_init();
+

        gtk_init(NULL, NULL);
        gtk_init(NULL, NULL);

+       settings = g_settings_new("prss");
+

        builder = gtk_builder_new();
        gtk_builder_add_from_file
                (builder,
        builder = gtk_builder_new();
        gtk_builder_add_from_file
                (builder,