* decode subject in the right position; if we decode the full text, we don't get...

* put in a correct dummy string.

diff --git a/webcit/messages.c b/webcit/messages.c
index 79d39fdf68c3754cb8abb6e30a036326569e5d6e..3f939757ee7436e5b5fb1535f26313b57bc70811 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1656,10 +1656,6 @@ void display_summarized(int num) {
 
        wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
 
-#ifdef HAVE_ICONV
-       utf8ify_rfc822_string(WC->summ[num].subj);
-       utf8ify_rfc822_string(WC->summ[num].from);
-#endif 
        escputs(WC->summ[num].subj);//////////////////////////////////TODO: QP DECODE
        wprintf("</td>");
 
@@ -2017,13 +2013,13 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                                                fullname, sizeof WC->summ[nummsgs-1].from);
                                }
                                if (!IsEmptyStr(subject)) {
-                               safestrncpy(WC->summ[nummsgs-1].subj, subject,
-                                       sizeof WC->summ[nummsgs-1].subj);
-                               }
 #ifdef HAVE_ICONV
                                /** Handle subjects with RFC2047 encoding */
-                               utf8ify_rfc822_string(WC->summ[nummsgs-1].subj);
+                                       utf8ify_rfc822_string(subject);
 #endif
+                                       safestrncpy(WC->summ[nummsgs-1].subj, subject,
+                                                   sizeof WC->summ[nummsgs-1].subj);
+                               }
                                if (strlen(WC->summ[nummsgs-1].subj) > 75) {
                                        strcpy(&WC->summ[nummsgs-1].subj[72], "...");
                                }

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 6c8ba2c534f2ec23659e680df79c66d375377066..4d1772f620068b208518e9a4ac3a65a86b6d63c9 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -2867,7 +2867,7 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
        else {
                if (floor > MAX_FLOORS) {
                        wc_backtrace ();
-                       sprintf(folder, "%%%%%|%s", room);
+                       sprintf(folder, "%%%%%%|%s", room);
                }
                else {
                        sprintf(folder, "%s|%s", floorlist[floor], room);