[Emacs-diffs] /srv/bzr/emacs/trunk r107536: * gtkutil.c (x_wm_set_size_hint): Use one row in call to

[Jan D.]

------------------------------------------------------------
revno: 107536
fixes bug(s): http://debbugs.gnu.org/10954
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2012-03-08 19:49:13 +0100
message:
  * gtkutil.c (x_wm_set_size_hint): Use one row in call to
  FRAME_TEXT_LINES_TO_PIXEL_HEIGHT so base_height is greater than
  zero.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-03 04:18:09 +0000
+++ b/src/ChangeLog     2012-03-08 18:49:13 +0000
@@ -1,3 +1,9 @@
+2012-03-08  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (x_wm_set_size_hint): Use one row in call to
+       FRAME_TEXT_LINES_TO_PIXEL_HEIGHT so base_height is greater than
+       zero (Bug#10954).
+
 2012-03-03  Glenn Morris  <address@hidden>
 
        * alloc.c (Fgarbage_collect, misc-objects-consed): Doc fixes.

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-02-13 22:46:43 +0000
+++ b/src/gtkutil.c     2012-03-08 18:49:13 +0000
@@ -1304,10 +1304,13 @@
 
   hint_flags |= GDK_HINT_BASE_SIZE;
   base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f);
-  base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0)
+  /* Use one row here so base_height does not become zero.
+     Gtk+ and/or Unity on Ubuntu 12.04 can't handle it.  */
+  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_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */
 
   size_hints.base_width = base_width;
   size_hints.base_height = base_height;