simon-git: putty (master): Simon Tatham

Sat Aug 22 15:07:49 BST 2015

TL;DR:
  6d65a92 Stop using deprecated GTK_STOCK_* in GTK3.
  3a27e98 Avoid deprecated gtk_cell_renderer_get_size in GTK3.
  ace0dd6 Provide #defines for GTK3-deprecated gtk_{h,v}foo_new().
  5cef6f9 Stop using GTK3-deprecated gdk_get_display().
  01f6862 Stop using GTK3-deprecated gdk_window_set_background().
  2e3102a In GTK3, unifontsel should use GtkGrid, not GtkTable.
  32163c3 In GTK3, use the new GtkColorChooserDialog.
  dc16dd5 'pterm --display' should set $DISPLAY inside the terminal.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2015-08-22 15:07:49

commit 6d65a92dfc99f686caa70e95d2700e299ddb79a0
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=6d65a92dfc99f686caa70e95d2700e299ddb79a0;hp=d155f698b732bbff5ed48d56b214ef4fa6d83525
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 22 13:50:56 2015 +0100

    Stop using deprecated GTK_STOCK_* in GTK3.

    According to the GTK3 docs, we're now supposed to use fixed label
    strings instead.

 unix/gtkcompat.h |   11 ++++++++++-
 unix/gtkdlg.c    |    4 ++--
 unix/gtkfont.c   |    4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

commit 3a27e98fb77c20d5ff0aa7409e0744f2e622cf75
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=3a27e98fb77c20d5ff0aa7409e0744f2e622cf75;hp=6d65a92dfc99f686caa70e95d2700e299ddb79a0
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 22 13:53:29 2015 +0100

    Avoid deprecated gtk_cell_renderer_get_size in GTK3.

    gtk_cell_renderer_get_preferred_size() is the new way to do it.

 unix/gtkdlg.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit ace0dd64b737d84968edc4ced946327cb52332ef
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=ace0dd64b737d84968edc4ced946327cb52332ef;hp=3a27e98fb77c20d5ff0aa7409e0744f2e622cf75
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 22 13:59:20 2015 +0100

    Provide #defines for GTK3-deprecated gtk_{h,v}foo_new().

    In GTK3, GtkBox, GtkScrollbar and GtkSeparator are all single classes
    with a GtkOrientation parameter, whereas in GTK2 the horizontal and
    vertical versions were trivial subclasses of them. Hence, the old
    constructors are now deprecated, but _only_ the constructors are
    affected, since after constructing one you always used methods of the
    superclass on it anyway.

    Rather than faff about with an ifdef at every call site, I've just put
    some wrapper macros in gtkcompat.h to make it easy to keep this code
    similar between all supported GTK versions.

 unix/gtkcompat.h |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 5cef6f96c2e59fc4e2654a7a8deba8edcc181863
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5cef6f96c2e59fc4e2654a7a8deba8edcc181863;hp=ace0dd64b737d84968edc4ced946327cb52332ef
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 22 14:07:02 2015 +0100

    Stop using GTK3-deprecated gdk_get_display().

    The new way is gdk_display_get_name(gdk_display_get_default()), which
    returns a const char * rather than a char *, so I've also had to
    fiddle with the prototype and call sites of get_x_display().

    (Also included gtkcompat.h into uxputty.c, since that wanted to call
    gdk_get_display() but didn't previously include it.)

 unix/gtkcompat.h |    3 +++
 unix/gtkwin.c    |    2 +-
 unix/unix.h      |    2 +-
 unix/uxpty.c     |    2 +-
 unix/uxputty.c   |    3 +++
 5 files changed, 9 insertions(+), 3 deletions(-)

commit 01f68628c23a39bd0b6a7507bf23ce8037320af9
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=01f68628c23a39bd0b6a7507bf23ce8037320af9;hp=5cef6f96c2e59fc4e2654a7a8deba8edcc181863
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 22 14:11:45 2015 +0100

    Stop using GTK3-deprecated gdk_window_set_background().

    We now have to use gdk_window_set_background_rgba(), having first set
    up an appropriate GdkRGBA structure.

 unix/gtkwin.c |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

commit 2e3102a585b89dc35ed6e84c23a67a443efe078c
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=2e3102a585b89dc35ed6e84c23a67a443efe078c;hp=01f68628c23a39bd0b6a7507bf23ce8037320af9
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 22 14:28:04 2015 +0100

    In GTK3, unifontsel should use GtkGrid, not GtkTable.

    GtkTable is deprecated; the way of the future is GtkGrid, in which you
    don't have to specify the number of rows/columns in advance (it's
    worked out dynamically by observing what row/column numbers you
    actually attached anything to), and also you handle expansion
    behaviour by setting the "hexpand", "vexpand" or "expand" properties
    on the child widgets rather than setting flags in the container.

 unix/gtkfont.c |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

commit 32163c30efca53f8635433b7592a1f94add067a4
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=32163c30efca53f8635433b7592a1f94add067a4;hp=2e3102a585b89dc35ed6e84c23a67a443efe078c
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 22 14:49:02 2015 +0100

    In GTK3, use the new GtkColorChooserDialog.

    This replaces the old GtkColorSelectionDialog, and has the convenience
    advantage that the actual chooser (with all the 'set colour', 'get
    colour' methods) and the containing dialog box are now the same object
    implementing multiple interfaces, so I don't keep having to call 'get
    me the underlying chooser for this dialog' accessors. Also you now
    hook into both the OK and Cancel buttons (and all other response
    codes) at the same time with a single event.

 unix/gtkdlg.c |   74 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 67 insertions(+), 7 deletions(-)

commit dc16dd5aa4a3fb2e367bc6303963321e628594ac
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=dc16dd5aa4a3fb2e367bc6303963321e628594ac;hp=32163c30efca53f8635433b7592a1f94add067a4
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 22 15:05:12 2015 +0100

    'pterm --display' should set $DISPLAY inside the terminal.

    If you open a pterm on a different display via the --display
    command-line option rather than by setting $DISPLAY, I think (and
    other terminals seem to agree) that it's sensible to set $DISPLAY
    anyway for processes running inside the terminal.

 unix/uxpty.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)