From 8a4f888793f8b3e76b6647810ed0a3f79e3532c1 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 14 Sep 2013 22:44:56 +0200
Subject: [PATCH] de-apify GenerateRoomDisplay(), its only needed in serv_rwho.

---
 citadel/citserver.c              | 30 ------------------------------
 citadel/citserver.h              |  3 ---
 citadel/modules/rwho/serv_rwho.c | 30 ++++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 28de7e6bf..666c9cb52 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -368,36 +368,6 @@ int CtdlIsPublicClient(void)
 
 
 
-
-/* Don't show the names of private rooms unless the viewing
- * user also knows the rooms.
- */
-void GenerateRoomDisplay(char *real_room,
-			CitContext *viewed,
-			CitContext *viewer) {
-
-	int ra;
-
-	strcpy(real_room, viewed->room.QRname);
-	if (viewed->room.QRflags & QR_MAILBOX) {
-		strcpy(real_room, &real_room[11]);
-	}
-	if (viewed->room.QRflags & QR_PRIVATE) {
-		CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL);
-		if ( (ra & UA_KNOWN) == 0) {
-			strcpy(real_room, " ");
-		}
-	}
-
-	if (viewed->cs_flags & CS_CHAT) {
-		while (strlen(real_room) < 14) {
-			strcat(real_room, " ");
-		}
-		strcpy(&real_room[14], "<chat>");
-	}
-
-}
-
 /*
  * Convenience function.
  */
diff --git a/citadel/citserver.h b/citadel/citserver.h
index 3e616b19f..4224fcdcb 100644
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -45,9 +45,6 @@ void do_async_loop(void);
 void begin_session(struct CitContext *con);
 void citproto_begin_session(void);
 void citproto_begin_admin_session(void);
-void GenerateRoomDisplay(char *real_room,
-                        CitContext *viewed,
-                        CitContext *viewer);
 
 void help_subst (char *strbuf, char *source, char *dest);
 
diff --git a/citadel/modules/rwho/serv_rwho.c b/citadel/modules/rwho/serv_rwho.c
index 09e256f86..4c2e28cdc 100644
--- a/citadel/modules/rwho/serv_rwho.c
+++ b/citadel/modules/rwho/serv_rwho.c
@@ -52,6 +52,36 @@
 
 #include "ctdl_module.h"
 
+/* Don't show the names of private rooms unless the viewing
+ * user also knows the rooms.
+ */
+void GenerateRoomDisplay(char *real_room,
+			CitContext *viewed,
+			CitContext *viewer) {
+
+	int ra;
+
+	strcpy(real_room, viewed->room.QRname);
+	if (viewed->room.QRflags & QR_MAILBOX) {
+		strcpy(real_room, &real_room[11]);
+	}
+	if (viewed->room.QRflags & QR_PRIVATE) {
+		CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL);
+		if ( (ra & UA_KNOWN) == 0) {
+			strcpy(real_room, " ");
+		}
+	}
+
+	if (viewed->cs_flags & CS_CHAT) {
+		while (strlen(real_room) < 14) {
+			strcat(real_room, " ");
+		}
+		strcpy(&real_room[14], "<chat>");
+	}
+
+}
+
+
 
 /*
  * display who's online
-- 
2.30.2