(no commit message)

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f227b41..5b23720 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -40,6 +40,11 @@ enum {
        COL_FEED_ID
 };
 
+enum {
+       COL_HEADLINE_TITLE,
+       COL_HEADLINE_ID
+};
+
 static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
@@ -76,22 +81,23 @@ static void print_help()
        printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
-GtkTreeView *w_treeview;
-GtkTreeView *w_headlineview;
+GtkTreeView *w_feedtree;
+GtkTreeView *w_headlinetree;
 
 void update()
 {
        struct feed **feeds;
-       GtkTreeModel *model;
+       GtkTreeModel *model, *headlinemodel;
        GtkTreeIter iter;
        char *title;
 
-       model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_feedtree));
 
        printf("update(): clear feed tree\n");
        model_state = 1;
        gtk_list_store_clear(GTK_LIST_STORE(model));
-       gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(w_headlineview)));
+       headlinemodel = gtk_tree_view_get_model(w_headlinetree);
+       gtk_list_store_clear(GTK_LIST_STORE(headlinemodel));
        printf("update(): clear feed tree done\n");
        feeds = ttrss_get_feeds();
        while (feeds && *feeds) {
@@ -177,10 +183,10 @@ static struct feed *get_selected_feed()
        GtkTreeModel *model;
        int id;
 
-       gtk_tree_view_get_cursor(w_treeview, &path, &cols);
+       gtk_tree_view_get_cursor(w_feedtree, &path, &cols);
 
        if (path) {
-               model = gtk_tree_view_get_model(w_treeview);
+               model = gtk_tree_view_get_model(w_feedtree);
                gtk_tree_model_get_iter(model, &iter, path);
                gtk_tree_model_get(model, &iter, 1, &id, -1);
 
@@ -199,10 +205,10 @@ static struct headline *get_selected_headline(GtkTreeIter *iter)
        GtkTreeModel *model;
        int id;
 
-       gtk_tree_view_get_cursor(w_headlineview, &path, &cols);
+       gtk_tree_view_get_cursor(w_headlinetree, &path, &cols);
 
        if (path) {
-               model = gtk_tree_view_get_model(w_headlineview);
+               model = gtk_tree_view_get_model(w_headlinetree);
                gtk_tree_model_get_iter(model, iter, path);
                gtk_tree_model_get(model, iter, 1, &id, -1);
 
@@ -231,7 +237,7 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        feed = get_selected_feed();
 
        if (feed) {
-               headline_model = gtk_tree_view_get_model(w_headlineview);
+               headline_model = gtk_tree_view_get_model(w_headlinetree);
                headline_store = GTK_LIST_STORE(headline_model);
                model_state = 1;
                gtk_list_store_clear(headline_store);
@@ -240,22 +246,22 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                        headlines = ttrss_feed_get_headlines(feed);
                        while (headlines && *headlines) {
                                gtk_list_store_append(headline_store, &iter);
-                               
+
                                if ((*headlines)->unread)
                                        title = g_strdup_printf
                                                ("<b>%s</b>",
                                                 (*headlines)->title);
                                else
                                        title = strdup((*headlines)->title);
-                               
+
                                gtk_list_store_set(headline_store,
                                                   &iter,
                                                   0, title,
                                                   1, (*headlines)->id,
                                                   -1);
-                               
+
                                free(title);
-                               
+
                                headlines++;
                        }
                }
@@ -271,7 +277,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        GtkTreeIter iter;
        GtkTreeModel *model;
        struct headline *headline;
-       const char *str;
+       char *str;
 
        printf("headline_cursor_changed_cbk\n");
 
@@ -288,20 +294,21 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                else
                        web_load("");
 
+               free(str);
+
                if (headline->unread) {
                        ttrss_set_article_unread(headline->id, 0);
                        headline->unread = 0;
                }
 
-               model = gtk_tree_view_get_model(w_headlineview);
+               model = gtk_tree_view_get_model(w_headlinetree);
                gtk_list_store_set(GTK_LIST_STORE(model),
                                   &iter,
                                   0, headline->title,
                                   -1);
        } else {
                printf("headline not found\n");
-       }               
-
+       }
 
        return TRUE;
 }
@@ -313,25 +320,31 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
        GtkTreeSelection *selection;
        GtkTreeModel *model;
        GtkTreeIter iter;
-       struct feed *feed;
+       struct headline *h;
        const char *url;
+       int id;
 
        printf("headline_row_activated_cbk\n");
 
-       selection = gtk_tree_view_get_selection(w_headlineview);
-       model = gtk_tree_view_get_model(w_headlineview);
+       selection = gtk_tree_view_get_selection(w_headlinetree);
+       model = gtk_tree_view_get_model(w_headlinetree);
 
        if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
-               gtk_tree_model_get(model, &iter, 1, &feed, -1);
-               url = feed->url;
+               gtk_tree_model_get(model, &iter, 1, &id, -1);
 
-               if (gtk_widget_has_screen(widget))
-                       screen = gtk_widget_get_screen(widget);
-               else
-                       screen = gdk_screen_get_default();
+               h = ttrss_get_headline(id);
+               if (h) {
+                       url = h->url;
 
-               error = NULL;
-               gtk_show_uri(screen, url, gtk_get_current_event_time(), &error);
+                       if (gtk_widget_has_screen(widget))
+                               screen = gtk_widget_get_screen(widget);
+                       else
+                               screen = gdk_screen_get_default();
+
+                       error = NULL;
+                       gtk_show_uri(screen, url,
+                                    gtk_get_current_event_time(), &error);
+               }
        }
 }
 
@@ -398,9 +411,9 @@ int main(int argc, char **argv)
                 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
                 NULL);
        window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
-       w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder,
+       w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
                                                          "feed_tree"));
-       w_headlineview = GTK_TREE_VIEW(gtk_builder_get_object(builder,
+       w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
                                                              "headline_tree"));
 
        gtk_builder_connect_signals(builder, NULL);