...and the rest of r8854.

[u/mdw/putty] / unix / gtkdlg.c

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 53a7025..cefd768 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -701,6 +701,7 @@ int dlg_listbox_index(union control *ctrl, void *dlg)
     if (uc->treeview) {
        GtkTreeSelection *treesel;
        GtkTreePath *path;
+       GtkTreeModel *model;
        GList *sellist;
        gint *indices;
        int ret;
@@ -711,7 +712,7 @@ int dlg_listbox_index(union control *ctrl, void *dlg)
        if (gtk_tree_selection_count_selected_rows(treesel) != 1)
            return -1;
 
-       sellist = gtk_tree_selection_get_selected_rows(treesel, NULL);
+       sellist = gtk_tree_selection_get_selected_rows(treesel, &model);
 
        assert(sellist && sellist->data);
        path = sellist->data;
@@ -3418,7 +3419,7 @@ static void licence_clicked(GtkButton *button, gpointer data)
     char *title;
 
     char *licence =
-       "Copyright 1997-2008 Simon Tatham.\n\n"
+       "Copyright 1997-2010 Simon Tatham.\n\n"
 
        "Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
        "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas "
@@ -3499,7 +3500,7 @@ void about_box(void *window)
                       w, FALSE, FALSE, 5);
     gtk_widget_show(w);
 
-    w = gtk_label_new("Copyright 1997-2008 Simon Tatham. All rights reserved");
+    w = gtk_label_new("Copyright 1997-2010 Simon Tatham. All rights reserved");
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox),
                       w, FALSE, FALSE, 5);
     gtk_widget_show(w);