Merge out from trunk, to keep this branch viable. We are now up to

date as of r7913.

[originally from svn r7914]
[r7913 == d7eda6d99cb6b7c2e09489dcf13b23c4cfcc61a2]

diff --cc LICENCE
Simple merge

diff --cc doc/licence.but
Simple merge

diff --cc mac/mac_res.r
Simple merge

diff --cc mac/macpgen.r
Simple merge

diff --cc mkfiles.pl
index 3cc580cb95fb71628f99c1628121009d5b0715ea,d43551b3bf01734937956e7fc3d434ebc4962c39..f0a57570ce7482ae8d04159404a724fa57c07398
--- 1/mkfiles.pl
--- 2/mkfiles.pl
+++ b/mkfiles.pl
@@@ -933,10 -927,10 +933,10 @@@ if (defined $makefiles{'gtk'}) 
      "\n".
      &splitline("CFLAGS = -O2 -Wall -Werror -g " .
               (join " ", map {"-I$dirpfx$_"} @srcdirs) .
 -             " `gtk-config --cflags`").
 +             " `\$(GTK_CONFIG) --cflags`").
                 " -D _FILE_OFFSET_BITS=64\n".
-     "XLDFLAGS = `\$(GTK_CONFIG) --libs`\n".
-     "ULDFLAGS =#\n".
 -    "XLDFLAGS = \$(LDFLAGS) `gtk-config --libs`\n".
++    "XLDFLAGS = \$(LDFLAGS) `\$(GTK_CONFIG) --libs`\n".
+     "ULDFLAGS = \$(LDFLAGS)\n".
      "INSTALL=install\n",
      "INSTALL_PROGRAM=\$(INSTALL)\n",
      "INSTALL_DATA=\$(INSTALL)\n",

diff --cc unix/gtkdlg.c
index 966164ac025e4ecf3a04bcc44802b5c907e70cfb,bdfe3e55ecc320f3fbea6fe45378e1d3ff7c5ae2..ee520a374990ca729de2766103aaebd218bb6c3a
--- 1/unix/gtkdlg.c
--- 2/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@@ -47,8 -56,8 +47,9 @@@ struct uctrl 
      GtkWidget *text;        /* for text */
      GtkWidget *label;         /* for dlg_label_change */
      GtkAdjustment *adj;       /* for the scrollbar in a list box */
 +    guint entrysig;
      guint textsig;
+     int nclicks;
  };
  
  struct dlgparam {
@@@ -94,12 -92,14 +95,14 @@@ static gboolean widget_focus(GtkWidget 
  static void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw,
                         int chr, int action, void *ptr);
  static void shortcut_highlight(GtkWidget *label, int chr);
 -static int listitem_single_key(GtkWidget *item, GdkEventKey *event,
 -                               gpointer data);
 -static int listitem_multi_key(GtkWidget *item, GdkEventKey *event,
 -                                 gpointer data);
 -static int listitem_button_press(GtkWidget *item, GdkEventButton *event,
 -                               gpointer data);
 -static int listitem_button_release(GtkWidget *item, GdkEventButton *event,
 -                                 gpointer data);
 +static gboolean listitem_single_key(GtkWidget *item, GdkEventKey *event,
 +                                  gpointer data);
 +static gboolean listitem_multi_key(GtkWidget *item, GdkEventKey *event,
 +                                 gpointer data);
- static gboolean listitem_button(GtkWidget *item, GdkEventButton *event,
-                               gpointer data);
++static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
++                                    gpointer data);
++static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
++                                      gpointer data);
  static void menuitem_activate(GtkMenuItem *item, gpointer data);
  static void coloursel_ok(GtkButton *button, gpointer data);
  static void coloursel_cancel(GtkButton *button, gpointer data);
@@@ -1121,13 -1088,26 +1126,26 @@@ static gboolean listitem_multi_key(GtkW
      return listitem_key(item, event, data, TRUE);
  }
  
- static gboolean listitem_button(GtkWidget *item, GdkEventButton *event,
-                               gpointer data)
 -static int listitem_button_press(GtkWidget *item, GdkEventButton *event,
 -                               gpointer data)
++static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
++                                    gpointer data)
  {
      struct dlgparam *dp = (struct dlgparam *)data;
-     if (event->type == GDK_2BUTTON_PRESS ||
-       event->type == GDK_3BUTTON_PRESS) {
-       struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
+     struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
+     switch (event->type) {
+     default:
+     case GDK_BUTTON_PRESS: uc->nclicks = 1; break;
+     case GDK_2BUTTON_PRESS: uc->nclicks = 2; break;
+     case GDK_3BUTTON_PRESS: uc->nclicks = 3; break;
+     }
+     return FALSE;
+ }
+ 
 -static int listitem_button_release(GtkWidget *item, GdkEventButton *event,
 -                                   gpointer data)
++static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
++                                      gpointer data)
+ {
+     struct dlgparam *dp = (struct dlgparam *)data;
+     struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
+     if (uc->nclicks>1) {
        uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_ACTION);
          return TRUE;
      }

diff --cc unix/gtkwin.c
Simple merge

diff --cc windows/pageant.rc
Simple merge

diff --cc windows/puttygen.rc
Simple merge

diff --cc windows/win_res.rc2
Simple merge