[vte/vte-0-44] widget: gtk: Pass NULL for geometry widget

[Christian Persch <chpe src gnome org>]

commit 4d08c32cb77a4c7e24cba33d3b1c0508f7c2fb24
Author: Christian Persch <chpe gnome org>
Date:   Mon Aug 15 14:39:28 2016 +0200

    widget: gtk: Pass NULL for geometry widget
    
    Since gtk 3.20 the geometry hints are not applied if
    the geometry widget passed is not NULL.
    
    This makes geometry a bit better, but still not right. Need
    to bring over the fixed to gnome-terminal from bug 760944.
    
    (cherry picked from commit 28871b33b03d2f7e2df8c065189547add12f673d)

 src/vtegtk.cc |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 34caa58..00e82e4 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -3248,7 +3248,11 @@ vte_terminal_set_geometry_hints_for_window(VteTerminal *terminal,
 
         vte_terminal_get_geometry_hints(terminal, &hints, MIN_ROWS, MIN_COLUMNS);
         gtk_window_set_geometry_hints(window,
+#if GTK_CHECK_VERSION (3, 19, 5)
+                                      NULL,
+#else
                                       &terminal->widget,
+#endif
                                       &hints,
                                       (GdkWindowHints)(GDK_HINT_RESIZE_INC |
                                                        GDK_HINT_MIN_SIZE |