[Emacs-diffs] /srv/bzr/emacs/trunk r109821: * gtkutil.c (x_wm_set_size_hint): Use 1 col for base_width so it

[Jan D.]

------------------------------------------------------------
revno: 109821
fixes bug: http://debbugs.gnu.org/12234
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-30 18:07:44 +0200
message:
  * gtkutil.c (x_wm_set_size_hint): Use 1 col for base_width so it
  does not become zero.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-30 15:07:00 +0000
+++ b/src/ChangeLog     2012-08-30 16:07:44 +0000
@@ -1,3 +1,8 @@
+2012-08-30  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (x_wm_set_size_hint): Use 1 col for base_width so it
+       does not become zero (Bug#12234).
+
 2012-08-30  Paul Eggert  <address@hidden>
 
        * dispnew.c (update_frame_1): Pacify gcc -Wstrict-overflow

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-08-16 21:58:44 +0000
+++ b/src/gtkutil.c     2012-08-30 16:07:44 +0000
@@ -1348,13 +1348,14 @@
   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.
+  /* Use one row/col here so base_height/width 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;