From 49663514bf74233fa89b9cf1800264c848e174e0 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 16 Jun 2008 03:22:25 +0000 Subject: [PATCH] When grabbing addresses for the address book popup, return to the original room using gotoroom(saved_roomname) rather than calling BSTR. Fixes this bug in three different places. --- webcit/addressbook_popup.c | 2 +- webcit/roomops.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c index 7269b043b..fe4ca703b 100644 --- a/webcit/addressbook_popup.c +++ b/webcit/addressbook_popup.c @@ -156,7 +156,7 @@ void display_address_book_inner_div() { } DeleteHashPos(&it); DeleteHash(&List); - gotoroom((char*)BSTR(saved_roomname)); /* TODO: get rid of typecast */ + gotoroom(saved_roomname); } wprintf("\n"); diff --git a/webcit/roomops.c b/webcit/roomops.c index d8a3d7c5f..788b8cfe1 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -737,10 +737,8 @@ void embed_room_banner(char *got, int navbar_style) { } -/** - * \brief back end routine to take the session to a new room - * \param gname room to go to - * +/* + * back end routine to take the session to a new room */ int gotoroom(char *gname) { @@ -748,7 +746,7 @@ int gotoroom(char *gname) static long ls = (-1L); int err = 0; - /** store ungoto information */ + /* store ungoto information */ strcpy(WC->ugname, WC->wc_roomname); WC->uglsn = ls; -- 2.30.2