(no commit message)

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f227b41..91eb0dc 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,8 +81,8 @@ 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()
 {
@@ -86,12 +91,12 @@ void update()
        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)));
+       gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(w_headlinetree)));
        printf("update(): clear feed tree done\n");
        feeds = ttrss_get_feeds();
        while (feeds && *feeds) {
@@ -177,10 +182,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 +204,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 +236,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);
@@ -293,7 +298,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                        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,
@@ -313,25 +318,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))
+               h = ttrss_get_headline(id);
+               if (h) {
+                       url = h->url;
+                       
+                       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);
+                       else
+                               screen = gdk_screen_get_default();
+                       
+                       error = NULL;
+                       gtk_show_uri(screen, url, 
+                                    gtk_get_current_event_time(), &error);
+               }
        }
 }
 
@@ -398,9 +409,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);