From c27e730a913cb5cd2fdd7ab6825b84892b832bf4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Tue, 10 Aug 2010 18:39:54 +0000 Subject: [PATCH] * the navbar style isn't used, remove it. --- webcit/roomops.c | 435 +++++++++++++++++++++++------------------------ webcit/webcit.c | 2 +- webcit/webcit.h | 7 +- 3 files changed, 216 insertions(+), 228 deletions(-) diff --git a/webcit/roomops.c b/webcit/roomops.c index ad90f2d3a..1b7925641 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -258,13 +258,11 @@ void zapped_list(void) * */ -void embed_room_banner(char *got, int navbar_style) { +void embed_room_banner(char *got) +{ wcsession *WCC = WC; char buf[256]; - char buf2[1024]; - char with_files[256]; - int file_count=0; - + /* * We need to have the information returned by a GOTO server command. * If it isn't supplied, we fake it by issuing our own GOTO. @@ -282,7 +280,7 @@ void embed_room_banner(char *got, int navbar_style) { " room_is_trash = %d; \n" "\n", ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) - ); + ); /* * If the user happens to select the "make this my start page" link, @@ -295,7 +293,7 @@ void embed_room_banner(char *got, int navbar_style) { StrBufPrintf(WCC->Hdr->this_page, "dotskip?room=%s", ChrPtr(WC->CurRoom.name) - ); + ); /* Check for new mail. */ WC->new_mail = extract_int(&got[4], 9); @@ -303,11 +301,11 @@ void embed_room_banner(char *got, int navbar_style) { do_template("roombanner", NULL); /* roombanner contains this for mobile */ - if (navbar_style != navbar_none && (WC->is_mobile < 1)) { + if (WC->is_mobile < 1) { wc_printf("
\n"); } - } @@ -3295,7 +3288,7 @@ void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP) void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP) { wc_printf("
\n"); - embed_room_banner(NULL, navbar_default); + embed_room_banner(NULL); wc_printf("
\n"); } diff --git a/webcit/webcit.c b/webcit/webcit.c index 71fdef959..f7f793169 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -213,7 +213,7 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers if (do_room_banner == 1) { wc_printf("
\n"); - embed_room_banner(NULL, navbar_default); + embed_room_banner(NULL); wc_printf("
\n"); } } diff --git a/webcit/webcit.h b/webcit/webcit.h index de793952c..a6cdf3235 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -844,15 +844,10 @@ void summary(void); int is_mobile_ua(char *user_agent); -void embed_room_banner(char *, int); +void embed_room_banner(char *); HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP); HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP); int SortRoomsByListOrder(const void *room1, const void *room2); -/* navbar types that can be passed to embed_room_banner */ -enum { - navbar_none, - navbar_default -}; /* actual supported locales */ void TmplGettext(StrBuf *Target, WCTemplputParams *TP); -- 2.30.2