* Final touches on the new message formatter.

[citadel.git] / citadel / messages.c

diff --git a/citadel/messages.c b/citadel/messages.c
index ed330dc992be2add49a79def31781838701a602b..b733f5feba18dd82c7d83a5880cea077e47469b1 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -586,7 +586,7 @@ int read_message(CtdlIPC *ipc,
         * Here we go
         */
        if (format_type == 0) {
-               fr = fmout2(screenwidth, NULL, message->text, dest,
+               fr = fmout(screenwidth, NULL, message->text, dest,
                           ((pagin == 1) ? 1 : 0), screenheight, (-1), 1);
        } else {
                /* FIXME: renderer for text/plain */
@@ -766,7 +766,7 @@ int client_make_message(CtdlIPC *ipc,
        if (mode == 0) {
                fp = fopen(filename, "r");
                if (fp != NULL) {
-                       fmout2(screenwidth, fp, NULL, NULL, 0, screenheight, 0, 0);
+                       fmout(screenwidth, fp, NULL, NULL, 0, screenheight, 0, 0);
                        beg = ftell(fp);
                        fclose(fp);
                } else {
@@ -876,7 +876,7 @@ MECR:       if (mode == 2) {
                }
                fp = fopen(filename, "r");
                if (fp != NULL) {
-                       fmout2(screenwidth, fp, NULL, NULL,
+                       fmout(screenwidth, fp, NULL, NULL,
                              ((userflags & US_PAGINATOR) ? 1 : 0),
                              screenheight, 0, 0);
                        beg = ftell(fp);