(no commit message)

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 73d537d..c9f15a9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,17 +22,18 @@
 #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;
 static GSettings *settings;
 
+static int model_state;
 
 static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
@@ -85,9 +86,13 @@ 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++) {
+       printf("update(): clear feed tree\n");
+       model_state = 1;
+       gtk_list_store_clear(GTK_LIST_STORE(model));
+       printf("update(): clear feed tree done\n");
+       feeds = ttrss_get_feeds();
+       while(feeds && *feeds) {
                if ((*feeds)->unread)
                        title = g_strdup_printf("<b>%s (%d)</b>",
                                                (*feeds)->title,
@@ -104,10 +109,19 @@ void update()
                                   1, (*feeds),
                                   -1);
                free(title);
+               feeds++;
        }
+       model_state = 0;
+
        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;
@@ -144,6 +158,8 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
                g_settings_set_string(settings,
                                      "user", 
                                      gtk_entry_get_text(login));
+
+               update();
        }
 
        gtk_widget_destroy(GTK_WIDGET(diag));
@@ -173,6 +189,7 @@ 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);
+               model_state = 1;
                gtk_list_store_clear(headline_store);
 
                headlines = ttrss_get_headlines(feed);
@@ -196,6 +213,7 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                        headlines++;
                }
 
+               model_state = 0;
                gtk_tree_path_free(path);
        }
 
@@ -204,13 +222,17 @@ 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");
+       
+       if (model_state)
+               return TRUE;
 
        gtk_tree_view_get_cursor(treeview, &path, &cols);
 
@@ -219,7 +241,22 @@ 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(headline);
+
+               if (str)
+                       web_load(str);
+               else
+                       web_load("");
+
+               if (headline->unread) {
+                       ttrss_set_article_unread(headline->id, 0);
+                       headline->unread = 0;
+               }
+
+               gtk_list_store_set(GTK_LIST_STORE(model),
+                                  &iter,
+                                  0, headline->title,
+                                  -1);
 
                gtk_tree_path_free(path);
        }
@@ -227,6 +264,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)
 {
@@ -274,7 +342,7 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       phttp_init();
+       http_init();
 
        gtk_init(NULL, NULL);
        settings = g_settings_new("prss");
@@ -300,8 +368,6 @@ int main(int argc, char **argv)
 
        gtk_widget_show_all(window);
 
-       update();
-
        gtk_main();
 
        exit(EXIT_SUCCESS);