[5603] window_deletion_notifier removed

[Gavin D. Smith]

Revision: 5603
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5603
Author:   gavin
Date:     2014-05-25 18:46:50 +0000 (Sun, 25 May 2014)
Log Message:
-----------
window_deletion_notifier removed

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/session.c
    trunk/info/window.c
    trunk/info/window.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-25 18:27:00 UTC (rev 5602)
+++ trunk/ChangeLog     2014-05-25 18:46:50 UTC (rev 5603)
@@ -1,4 +1,12 @@
 2014-05-25  Gavin Smith  <address@hidden>
+
+       * info/window.c (window_new_screen_size): Call forget_window_and_nodes
+       instead of window_deletion_notifier.
+       (window_deletion_notifier): Removed.
+       * info/session.c (initialize_window_session): Don't set
+       window_deletion_notifier to forget_window_and_nodes.
+
+2014-05-25  Gavin Smith  <address@hidden>
        
        * info/session.c (info_scroll_forward, info_scroll_backward)
        (info_scroll_forward_set_window, info_scroll_backward_set_window)

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-05-25 18:27:00 UTC (rev 5602)
+++ trunk/info/session.c        2014-05-25 18:46:50 UTC (rev 5603)
@@ -281,10 +281,6 @@
   initialize_info_signal_handler ();
   display_initialize_display (screenwidth, screenheight);
 
-  /* Tell the window system how to notify us when a window needs to be
-     asynchronously deleted (e.g., user resizes window very small). */
-  window_deletion_notifier = (VFunction *) forget_window_and_nodes;
-
   /* If input has not been redirected yet, make it come from unbuffered
      standard input. */
   if (!info_input_stream)

Modified: trunk/info/window.c
===================================================================
--- trunk/info/window.c 2014-05-25 18:27:00 UTC (rev 5602)
+++ trunk/info/window.c 2014-05-25 18:46:50 UTC (rev 5603)
@@ -96,11 +96,6 @@
    after deleting the window from our chain of windows.  If DELETER is NULL,
    nothing extra is done.  The last window can never be deleted, but it can
    become invisible. */
-
-/* If non-null, a function to call with WINDOW as argument when the function
-   window_new_screen_size () has deleted WINDOW. */
-VFunction *window_deletion_notifier = NULL;
-
 void
 window_new_screen_size (int width, int height)
 {
@@ -150,8 +145,7 @@
       if (!win)
         win = windows;
 
-      if (window_deletion_notifier)
-        (*window_deletion_notifier) (win);
+      forget_window_and_nodes (win);
 
       window_delete_window (win);
       numwins--;

Modified: trunk/info/window.h
===================================================================
--- trunk/info/window.h 2014-05-25 18:27:00 UTC (rev 5602)
+++ trunk/info/window.h 2014-05-25 18:46:50 UTC (rev 5603)
@@ -138,12 +138,6 @@
    or the previous window in the chain if there is no next window. */
 extern void window_delete_window (WINDOW *window);
 
-/* A function to call when the screen changes size, and some windows have
-   to get deleted.  The function is called with the window to be deleted
-   as an argument, and it can't do anything about the window getting deleted;
-   it can only clean up dangling references to that window. */
-extern VFunction *window_deletion_notifier;
-
 /* Set WINDOW to display NODE. */
 extern void window_set_node_of_window (WINDOW *window, NODE *node);