[Emacs-diffs] /srv/bzr/emacs/trunk r100677: * nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add

[Jan D]

------------------------------------------------------------
revno: 100677
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-01 12:45:26 +0200
message:
  * nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add
  BLOCK/UNBLOCK_INPUT so asserts don't trigger.
modified:
  src/ChangeLog
  src/nsmenu.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-01 00:14:17 +0000
+++ b/src/ChangeLog     2010-07-01 10:45:26 +0000
@@ -1,3 +1,8 @@
+2010-07-01  Jan Djärv  <address@hidden>
+
+       * nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add
+       BLOCK/UNBLOCK_INPUT so asserts don't trigger.
+
 2010-06-30  Chong Yidong  <address@hidden>
 
        * frame.c (get_future_frame_param, Fmake_terminal_frame): Don't

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2010-04-13 06:01:46 +0000
+++ b/src/nsmenu.m      2010-07-01 10:45:26 +0000
@@ -999,7 +999,9 @@
     Under NS we just hide the toolbar until it might be needed again.
    -------------------------------------------------------------------------- 
*/
 {
+  BLOCK_INPUT;
   [[FRAME_NS_VIEW (f) toolbar] setVisible: NO];
+  UNBLOCK_INPUT;
 }
 
 void
@@ -1011,6 +1013,7 @@
   int i;
   EmacsToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar];
 
+  BLOCK_INPUT;
   [toolbar clearActive];
 
   /* update EmacsToolbar as in GtkUtils, build items list */
@@ -1094,6 +1097,7 @@
       [newDict release];
     }
 
+  UNBLOCK_INPUT;
 }