[Emacs-diffs] /srv/bzr/emacs/trunk r100830: * xmenu.c (free_frame_menubar): Only call x_set_window_size if

[Jan D]

------------------------------------------------------------
revno: 100830
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-16 09:50:37 +0200
message:
  * xmenu.c (free_frame_menubar): Only call x_set_window_size if
  widget is non-null (Bug#6645).
modified:
  src/ChangeLog
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-15 21:54:10 +0000
+++ b/src/ChangeLog     2010-07-16 07:50:37 +0000
@@ -1,3 +1,8 @@
+2010-07-16  Jan Djärv  <address@hidden>
+
+       * xmenu.c (free_frame_menubar): Only call x_set_window_size if
+       widget is non-null (Bug#6645).
+
 2010-07-15  Andreas Schwab  <address@hidden>
 
        * xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font):

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2010-07-15 21:53:32 +0000
+++ b/src/xmenu.c       2010-07-16 07:50:37 +0000
@@ -1355,15 +1355,15 @@
       lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id);
       f->output_data.x->menubar_widget = NULL;
 
-#ifdef USE_MOTIF
       if (f->output_data.x->widget)
        {
+#ifdef USE_MOTIF
          XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL);
          if (x1 == 0 && y1 == 0)
            XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL);
+#endif
+          x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
        }
-#endif
-      x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
       UNBLOCK_INPUT;
     }
 }