PREFIXES are never to come back

world/net/applet/user.c

@@ -50,12 +50,7 @@ pr(mc, fmt, a,b,c,d,e,f,g,h,i,j,k) {
 			// weil sonst die logout-meldung den bach runtergeht
 		}
 #endif
-		if (!(abbrev("_message", mc)
+		if (!(abbrev("_message", mc))) {
-# ifdef PREFIXES
-		       	|| abbrev("_prefix", mc)
-# endif
-			)) {
-
 			if (abbrev("_list", mc) || abbrev("_echo", mc))
 			    fmt = "|* "+ fmt;
 			else {

world/net/irc/common.c

@@ -184,13 +184,7 @@ render(string mc, string data, mapping vars, mixed source) {
 #ifdef NEW_LINE
 	output += "\n";
 #else
-	if (template == "") {
+	if (template == "") output += "\n";
-# ifdef PREFIXES //{{{
-	    if (abbrev("_prefix", mc)) return prefix = output+" ";
-	    else
-# endif //}}}
-		output += "\n";
-	}
 #endif
 	if (output[0] == '#') output = SERVER_SOURCE + output[1 ..];
 	else if (output[0] != ':') {

world/net/irc/user.c

@@ -37,14 +37,6 @@ msg(source, mc, data, mapping vars, showingLog) {
 	int special;
 	mixed a, res;
 	
-#ifdef PREFIXES //{{{
-	//ob das folgende so klug ist müssen wir (ich?) noch ergründen.
-	//aber da es temporär eh nicht genutzt wird...
-	//bis dahin erstmal jedesmal löschen.
-	if (prefix) {
-	    prefix = 0;
-	}
-#endif //}}}
 	P4(("irc:msg (%O,%s,%O,%O)\n", source, mc, data, vars))
 	P2(("irc:msg (%O,%s,%O..)\n", source, mc, data))
 
@@ -238,11 +230,6 @@ w(string mc, string data, mapping vars, mixed source) {
 
 	P3(("%O: irc:w(%O, %O, %O, %O) %O\n", ME, mc, data, 0, source, vars))
 
-#ifdef PREFIXES //{{{
-	// completely skip these methods.. sagt fippo.. na ob das richtig ist!?
-	if (abbrev("_prefix", mc)) return 1;
-#endif //}}}
-
 #ifndef GHOST
 	// should it be..?
 	//unless (ONLINE) return;

world/net/jabber/active.c

@@ -546,10 +546,6 @@ int msg(string source, string mc, string data,
      * the output from emit (use the new net/outputb ?)
      * this avoids bugs with destructed objects
      */
-#ifdef PREFIXES
-    // completely skip these methods
-    if (abbrev("_prefix", mc)) return 1;
-#endif
 #if 0 // !EXPERIMENTAL
     /* currently, we want _status_person_absent
      * this may change...

world/net/jabber/component.c

@@ -119,9 +119,6 @@ int msg(string source, string mc, string data,
 #else
     unless(vars["_language"]) vars["_language"] = "en";
 #endif
-#ifdef PREFIXES
-    if (abbrev("_prefix", mc)) return 1;
-#endif
 #ifndef GAMMA	// TODO: decide if this is good or bad
     else if (abbrev("_status_person_absent", mc)) {
 	PT(("Intercepted absent from %O to %O\n", mc, source, ME))

world/net/jabber/user.c

@@ -1256,11 +1256,6 @@ w(string mc, string data, mapping vars, mixed source) {
 	}
 	vars["_list_item"] = t;
 	break;
-#ifdef PREFIXES
-    default:
-	// until we have a better way to deal with them..
-	if (abbrev("_prefix", mc)) return;
-#endif
     }
 
     if (source)

world/net/textc.c

@@ -153,10 +153,6 @@ w(string mc, string data, mapping vars, mixed source) {
 
 #ifdef NEW_LINE
 	output += "\n";
-#else
-# ifdef PREFIXES
-	if (template == "") output += abbrev("_prefix", mc) ? " " : "\n";
-# endif
 #endif
 	//PT(("textc:w(%O,%O,%O,%O) - %O\n", mc,data,vars,source, template))
 

world/net/user.c

@@ -530,19 +530,6 @@ msg(source, mc, data, mapping vars, showingLog) {
 		}
 		P3(("%O time %O data %O from %O\n", ME, t, data, vars))
 	}
-#ifdef PREFIXES
-	if (t && intp(t)) {
-		// similar to time_or_date()
-		if (time() - t > 24*60*60)
-		    w("_prefix_time_date", isotime( t, 0 ));
-		else
-		    w("_prefix_time", hhmm(ctime( t )));
-		unless (showingLog) {
-			P0(("%O got _time_place w/out showingLog in %O\n",
-			    ME, vars))
-		}
-	}
-#endif
 	PSYC_TRY(mc) {
 case "_jabber_iq_error": // DONT reply
 		P2(("%O got %O", ME, mc))
@@ -1182,18 +1169,13 @@ pr(mc, fmt, a,b,c,d,e,f,g,h,i,j,k) {
 w(string mc, string data, mapping vars, mixed source, int showingLog) {
 	string template, output, type, loc;
 	mapping di = printStyle(mc); // display infos
-#ifdef PREFIXES
-	int isfix = abbrev("_prefix", mc);
-#else
 	int t;
-#endif
+
 	unless (vars) vars = ([]);
-#ifndef PREFIXES
 	else t = vars["_time_log"] || vars["_time_place"];
 	// would be nicer to have _time_log in /log rather than showingLog
 	if (!t && showingLog) t = vars["_time_INTERNAL"];
 	if (t && intp(t)) di["_prefix"] = time_or_date(t) +" ";
-#endif
 #if 0
 	template = T(di["_method"] || mc, 0);
 #else
@@ -1203,11 +1185,7 @@ w(string mc, string data, mapping vars, mixed source, int showingLog) {
 
 #ifndef _flag_enable_alternate_location_forward
 	// why did it say.. if (mc != lastmc && ...
-	if (mappingp(v("locations")) && sizeof(v("locations"))
+	if (mappingp(v("locations")) && sizeof(v("locations"))) {
-#ifdef PREFIXES
-	    && !isfix
-#endif
-	    ) {
 	    string nudata = data;
 	   
 	    // this little thing enables languages for psyc clients etc.
@@ -1336,18 +1314,10 @@ w(string mc, string data, mapping vars, mixed source, int showingLog) {
 		    if (!stringp(source)|| (vars["_INTERNAL_trust"] >5
 			 || (vars["_nick"] && data && strlen(data)
 			     && strstr(data, "[_nick]") != -1)))
-#ifdef PREFIXES
-			output += isfix ? " " : "\n";
-#else
 			output += "\n";
-#endif
 		    else {
 			//PT(("notemp %O %O %O\n", source, vars, data))
-#ifdef PREFIXES
-			output = "«"+source+"» "+output+( isfix ? " " : "\n" );
-#else
 			output = "«"+source+"» "+ output +"\n";
-#endif
 		    }
 		}
 		if (output != "")