* gtkutil.c (x_wm_set_size_hint): Use 1 col for base_width so it

does not become zero.  Backport from trunk.

Fixes: debbugs:12234

diff --git a/src/ChangeLog b/src/ChangeLog
index 28d4b1df989db34e50d078dd5849e933d85536cf..49c1fa345bbb95df94d4a8b682c0181f22666020 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-12  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * gtkutil.c (x_wm_set_size_hint): Use 1 col for base_width so it
+       does not become zero (Bug#12234).  Backport from trunk.
+
 2012-08-24  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.2 released.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 4dbef65dedfa982514ba4b3bca5b3d8cb7c70473..d3892ef55969f087e546135958871e4cd70d116f 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1303,13 +1303,14 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position)
   size_hints.height_inc = FRAME_LINE_HEIGHT (f);
 
   hint_flags |= GDK_HINT_BASE_SIZE;
-  base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f);
   /* Use one row here so base_height does not become zero.
      Gtk+ and/or Unity on Ubuntu 12.04 can't handle it.  */
+  base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TOOLBAR_WIDTH (f);
   base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1)
     + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
 
   check_frame_size (f, &min_rows, &min_cols);
+  if (min_cols > 0) --min_cols; /* We used one col in base_width = ... 1); */
   if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */
 
   size_hints.base_width = base_width;