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.

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 7269b043b577ab2553d931a0d9f680c379494436..fe4ca703bad10d156f684a03a5c5ae6cdc9457da 100644 (file)
--- 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("</select>\n");

diff --git a/webcit/roomops.c b/webcit/roomops.c
index d8a3d7c5f0eaaacc1a78e7497618478989f8fe7d..788b8cfe1a01ce9d58238adf0b91b8fff8522b4c 100644 (file)
--- 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;