[Gd-chatter] r11446 - trunk/libraries/gui-sniffer

[hannes at gwydiondylan.org]

Author: hannes
Date: Wed Sep 12 17:44:31 2007
New Revision: 11446

Modified:
   trunk/libraries/gui-sniffer/command-line.dylan
   trunk/libraries/gui-sniffer/gui-sniffer.dylan
Log:
Bug: 7299
pass the gui-sniffer-frame instance directly to make-nnv-shell-pane
instead of
"gui-sniffer.nnv-shell.command-line-server.server-context.nnv-context := gui-sniffer;"


Modified: trunk/libraries/gui-sniffer/command-line.dylan
==============================================================================
--- trunk/libraries/gui-sniffer/command-line.dylan	(original)
+++ trunk/libraries/gui-sniffer/command-line.dylan	Wed Sep 12 17:44:31 2007
@@ -82,7 +82,8 @@
 
 define function make-nnv-shell-pane
     (#rest initargs,
-     #key class = <nnv-shell-gadget>,
+     #key context,
+          class = <nnv-shell-gadget>,
           frame, buffer, #all-keys)
  => (window :: <nnv-shell-gadget>)
   let window = apply(make, class, initargs);
@@ -94,8 +95,9 @@
              direction: #"output");
     let server
       = make-command-line-server
-        (input-stream: stream,	// ignored, so this is safe!
-        output-stream: stream);
+        (real-context: context,
+         input-stream: stream,	// ignored, so this is safe!
+         output-stream: stream);
     window.command-line-server := server;
     dynamic-bind (*buffer* = buffer)
       select-buffer(window, buffer)
@@ -107,17 +109,20 @@
 
 define class <nnv-context> (<server-context>)
   keyword banner: = "Network Night Vision";
-  slot nnv-context;
+  slot nnv-context, init-keyword: nnv-context:;
 end;
 
 define method make-command-line-server
-    (#key banner :: false-or(<string>) = #f,
+    (#key real-context,
+          banner :: false-or(<string>) = #f,
           input-stream :: <stream>,
           output-stream :: <stream>,
           echo-input? :: <boolean> = #f,
           profile-commands? :: <boolean> = #f)
  => (server :: <command-line-server>)
-  let context = make(<nnv-context>, banner: banner);
+  let context = make(<nnv-context>,
+                     banner: banner,
+                     nnv-context: real-context);
   make(<command-line-server>,
        context:           context,
        input-stream:      input-stream,

Modified: trunk/libraries/gui-sniffer/gui-sniffer.dylan
==============================================================================
--- trunk/libraries/gui-sniffer/gui-sniffer.dylan	(original)
+++ trunk/libraries/gui-sniffer/gui-sniffer.dylan	Wed Sep 12 17:44:31 2007
@@ -498,7 +498,7 @@
 //            scroll-bars: #"vertical",
             text-style: make(<text-style>, family: #"fix"));
   pane nnv-shell (frame)
-    make-nnv-shell-pane();
+    make-nnv-shell-pane(context: frame);
 
   pane sniffer-status-bar (frame)
     make(<status-bar>, label: "Network Night Vision");
@@ -1009,7 +1009,6 @@
 define function main()
   initialize-icons();
   let gui-sniffer = make(<gui-sniffer-frame>);
-  gui-sniffer.nnv-shell.command-line-server.server-context.nnv-context := gui-sniffer;
   set-frame-size(gui-sniffer, 1024, 768);
 //  deuce/frame-window(gui-sniffer) := gui-sniffer.packet-hex-dump;
 //  deuce/*editor-frame* := gui-sniffer;