* don't choke if the vcard fails to load

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index db61561cf84a24bb0a2fecfa400bc77c966a859d..ccdaba684e5bf53178b4e0dc723a941971b3f752 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -122,7 +122,7 @@ void fetch_ab_name(message_summary *Msg, char **namebuf) {
        memset(&summ, 0, sizeof(summ));
        //////safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
 
-       serv_printf(buf, "MSG0 %ld|0", Msg->msgnum);    /** unfortunately we need the mime info now */
+       serv_printf("MSG0 %ld|0", Msg->msgnum); /** unfortunately we need the mime info now */
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') return;
 
@@ -778,7 +778,7 @@ void do_edit_vcard(long msgnum, char *partnum,
                        }
                        Buf = NewStrBuf();
                        serv_printf(buf, "DLAT %ld|%s", msgnum, partnum);
-                       StrBuf_ServGetlnBuffered(Buf);
+                       StrBuf_ServGetln(Buf);
                        if (GetServerStatus(Buf, NULL) != 6) {
                                convenience_page("770000", "Error", &(ChrPtr(Buf)[4]));
                                return;
@@ -1112,7 +1112,7 @@ void submit_vcard(void) {
                                             -1, 0);
                        /// todo: call the master dispatcher again...
                        if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
-                               select_user_to_edit(NULL, NULL);
+                               select_user_to_edit(NULL);
                        }
                        else if (!strcmp(bstr("return_to"), "do_welcome")) {
                                do_welcome();
@@ -1201,7 +1201,7 @@ void submit_vcard(void) {
        free(serialized_vcard);
 
        if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
-               select_user_to_edit(NULL, NULL);
+               select_user_to_edit(NULL);
        }
        else if (!strcmp(bstr("return_to"), "do_welcome")) {
                do_welcome();