patch 9.1.1377: patch v9.1.1370 causes some GTK warning messages

Problem:  Some GTK3 users experienced unexpectedly small windows at
          startup (after v9.1.1368, @berggeist, Tony Mechelynck)
Solution: Update window manager hints in gui_mch_open, partly revert
          v9.1.1370 (Drew Vogel)

fixes: #17279
closes: #17288

Signed-off-by: Drew Vogel <dvogel@github>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 762bdc1e517e1b872b78b72a6137e7a6d929f7eb..c000a1181f74019823a2ae809e61c49a7bebaaf6 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4532,13 +4532,11 @@ gui_mch_open(void)
     pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
     pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
 
-# if !GTK_CHECK_VERSION(3,0,0)
     // For GTK2 changing the size of the form widget doesn't cause window
     // resizing.
     if (gtk_socket_id == 0)
        gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height);
     update_window_manager_hints(0, 0);
-# endif
 
     if (foreground_argument != NULL)
        fg_pixel = gui_get_color((char_u *)foreground_argument);

diff --git a/src/version.c b/src/version.c
index 7547f0a58cf22df1a63d7d020c5ff873e5760cdd..aa7f461803e302a3ff10f7a87ef6e77979ac9ff9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1377,
 /**/
     1376,
 /**/