From c7949bd56aa6ed82cb705681d254de952b14f32b Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Fri, 21 Jan 2011 18:12:46 +0100
Subject: [PATCH] been wanting to rename edit.i into render.i just about
 forever

---
 CHANGESTODO                         | 11 +----------
 world/net/psyc/LICENSE              |  2 +-
 world/net/psyc/circuit.c            |  2 +-
 world/net/psyc/library.i            |  2 +-
 world/net/psyc/{edit.i => render.i} |  2 +-
 world/net/spyc/circuit.c            |  2 +-
 world/net/spyc/edit.i               |  4 ----
 world/net/spyc/render.i             |  4 ++++
 8 files changed, 10 insertions(+), 19 deletions(-)
 rename world/net/psyc/{edit.i => render.i} (99%)
 delete mode 100644 world/net/spyc/edit.i
 create mode 100644 world/net/spyc/render.i

diff --git a/CHANGESTODO b/CHANGESTODO
index a7acd41..6dfba3d 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -77,9 +77,6 @@ ________________________________________________________________________
 - newbies are allowed to open new owned rooms
   fippo sagt: ergo brauchst du nen exit-hook der owner löscht wenn der n00b-owner aus dem raum geht
 
-- double _link does produce an _unlink to the old client, but not the proper
-  place enter events..?
-
 - jabber logout isn't announced or offline avail isn't processed
   ... apparently other side did not logout properly, as it doesn't happen always
 
@@ -115,9 +112,6 @@ ________________________________________________________________________
 	halo
 	.
 
-- the linking blues...
-	tgX sagt: on reconnect i didn't get any _echo_place_enter_login's from this room, then no response for _request_do_enter, and after a _request_do_leave i get replies for enter/leave but instead of _echo_place_enter/leave i get _notice_place_enter/leave
-
 ? should /load inform that errors go to the console?
 
 ________________________________________________________________________
@@ -1481,9 +1475,6 @@ ________________________________________________________________________
     der ident sollte in jedem fall nur "el" sein
 	... ein sonderfall für den sonderfall? was änderts? wen kehrts?
 
-- apparently clients can _link multiply and even join rooms multiply,
-  but the side fx will not be nice
-
 - fippo meint es müsse ein replyvars-handling her. der eingriff wäre aber
   ziemlich dramatisch.. lynX vorschlag: die msg api müsste dann so aussehen
 mapping rvars msg(source, mc, data, vars, rvars);
@@ -3934,4 +3925,4 @@ net/person
 -	tg fixes the ~0 bug!
 === 201101 ============================================================
 *	removed interesting but unrecoverable FORK code
-
+*	unlink detection rewrite and other fixes in client linking code
diff --git a/world/net/psyc/LICENSE b/world/net/psyc/LICENSE
index 08b47a4..961b225 100644
--- a/world/net/psyc/LICENSE
+++ b/world/net/psyc/LICENSE
@@ -4,7 +4,7 @@
 
   The files contained in this directory, that is precisely
 
-    active.c circuit.c common.c edit.i library.i parse.i server.c udp.c and user.c
+    active.c circuit.c common.c render.i library.i parse.i server.c udp.c and user.c
 
   and additionally the psyc.h file in ../include
 
diff --git a/world/net/psyc/circuit.c b/world/net/psyc/circuit.c
index 23ec73c..b6fb5a3 100644
--- a/world/net/psyc/circuit.c
+++ b/world/net/psyc/circuit.c
@@ -294,7 +294,7 @@ int logon(int neverfails) {
 	return 0;
 }
 
-#include "edit.i"
+#include "render.i"
 
 // called from sendmsg() either by registered target or psyc: scheme
 //int delivermsg(string target, string mc, string data,
diff --git a/world/net/psyc/library.i b/world/net/psyc/library.i
index c7b2a24..2f57bfc 100644
--- a/world/net/psyc/library.i
+++ b/world/net/psyc/library.i
@@ -193,7 +193,7 @@ object find_psyc_object(array(mixed) u) {
 
 #ifndef __PIKE__
 // library transmits udp packets itself
-#include "edit.i"
+#include "render.i"
 #endif
 
 // target is lowercased already
diff --git a/world/net/psyc/edit.i b/world/net/psyc/render.i
similarity index 99%
rename from world/net/psyc/edit.i
rename to world/net/psyc/render.i
index b33741e..c0a3abc 100644
--- a/world/net/psyc/edit.i
+++ b/world/net/psyc/render.i
@@ -1,5 +1,5 @@
 // vim:foldmethod=marker:syntax=lpc:noexpandtab
-// $Id: edit.i,v 1.111 2008/12/01 11:31:33 lynx Exp $
+// $Id: render.i,v 1.111 2008/12/01 11:31:33 lynx Exp $
 //
 // headermaker functions. we should call it render rather than edit.
 
diff --git a/world/net/spyc/circuit.c b/world/net/spyc/circuit.c
index 55aaa12..712e2fa 100644
--- a/world/net/spyc/circuit.c
+++ b/world/net/spyc/circuit.c
@@ -21,7 +21,7 @@ volatile string netloc;
 #ifndef NEW_RENDER
 # define NEW_RENDER
 #endif
-#include "edit.i"
+#include "render.i"
 
 // this is completely anti-psyc. it should take mcs as arguments
 // and look up the actual message from textdb.. FIXME
diff --git a/world/net/spyc/edit.i b/world/net/spyc/edit.i
deleted file mode 100644
index 61e065a..0000000
--- a/world/net/spyc/edit.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// vim:foldmethod=marker:syntax=lpc:noexpandtab
-// $Id: edit.i,v 1.8 2008/02/19 16:28:41 lynx Exp $
-
-#include "../psyc/edit.i"
diff --git a/world/net/spyc/render.i b/world/net/spyc/render.i
new file mode 100644
index 0000000..7ca550f
--- /dev/null
+++ b/world/net/spyc/render.i
@@ -0,0 +1,4 @@
+// vim:foldmethod=marker:syntax=lpc:noexpandtab
+// $Id: render.i,v 1.8 2008/02/19 16:28:41 lynx Exp $
+
+#include "../psyc/render.i"