X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=6d52b05e94874d2b37438a71d79e1147607a732a;hb=b227ac2417bd40dfab2cb376422760d7eddfc95c;hp=f227b410003c5193e5d9625bc5c7d69ab356a17f;hpb=e68e296d497fcf6aadf73c0ee8f2dcd58aff0cc8;p=prss.git diff --git a/src/main.c b/src/main.c index f227b41..6d52b05 100644 --- 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'}, @@ -313,8 +318,9 @@ 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"); @@ -322,16 +328,21 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data) 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; + gtk_tree_model_get(model, &iter, 1, &id, -1); - if (gtk_widget_has_screen(widget)) + h = ttrss_get_headline(id); + if (feed) { + 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); + } } }