[Emacs-diffs] /srv/bzr/emacs/trunk r106593: * widget.c (update_wm_hints): Return if wmshell is null.

[Jan D.]

------------------------------------------------------------
revno: 106593
fixes bug(s): http://debbugs.gnu.org/10104
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2011-12-03 20:15:20 +0100
message:
  * widget.c (update_wm_hints): Return if wmshell is null.
  (widget_update_wm_size_hints): New function.
  
  * widget.h (widget_update_wm_size_hints): Declare.
  
  * xterm.c (x_wm_set_size_hint): If USE_X_TOOLKIT, call
  widget_update_wm_size_hints.
modified:
  src/ChangeLog
  src/widget.c
  src/widget.h
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-03 09:55:27 +0000
+++ b/src/ChangeLog     2011-12-03 19:15:20 +0000
@@ -1,3 +1,13 @@
+2011-12-03  Jan Djärv  <address@hidden>
+
+       * widget.c (update_wm_hints): Return if wmshell is null.
+       (widget_update_wm_size_hints): New function.
+
+       * widget.h (widget_update_wm_size_hints): Declare.
+
+       * xterm.c (x_wm_set_size_hint): If USE_X_TOOLKIT, call
+       widget_update_wm_size_hints (Bug#10104).
+
 2011-12-03  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (handle_invisible_prop): If the invisible text ends just

=== modified file 'src/widget.c'
--- a/src/widget.c      2011-11-27 04:43:11 +0000
+++ b/src/widget.c      2011-12-03 19:15:20 +0000
@@ -476,6 +476,9 @@
   int base_height;
   int min_rows = 0, min_cols = 0;
 
+  /* This happens when the frame is just created.  */
+  if (! wmshell) return;
+
 #if 0
   check_frame_size (ew->emacs_frame.frame, &min_rows, &min_cols);
 #endif
@@ -506,6 +509,14 @@
                 NULL);
 }
 
+void
+widget_update_wm_size_hints (Widget widget)
+{
+  EmacsFrame ew = (EmacsFrame)widget;
+  update_wm_hints (ew);
+}
+
+
 #if 0
 
 static void

=== modified file 'src/widget.h'
--- a/src/widget.h      2011-11-27 04:43:11 +0000
+++ b/src/widget.h      2011-12-03 19:15:20 +0000
@@ -95,5 +95,6 @@
 /* Special entry points */
 void EmacsFrameSetCharSize (Widget, int, int);
 void widget_store_internal_border (Widget widget);
+void widget_update_wm_size_hints (Widget widget);
 
 #endif /* _EmacsFrame_h */

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2011-11-29 18:08:53 +0000
+++ b/src/xterm.c       2011-12-03 19:15:20 +0000
@@ -9561,6 +9561,14 @@
   XSizeHints size_hints;
   Window window = FRAME_OUTER_WINDOW (f);
 
+#ifdef USE_X_TOOLKIT
+  if (f->output_data.x->widget)
+    {
+      widget_update_wm_size_hints (f->output_data.x->widget);
+      return;
+    }
+#endif
+
   /* Setting PMaxSize caused various problems.  */
   size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */;