Mercurial > hg > nnchat

changeset 544:e30fa8592a48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Possibly fix logging after latest changes.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 11 Nov 2012 19:08:21 +0200
parents 96d636c37976
children 895ede06ff11
files main.c
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/main.c	Sun Nov 11 19:05:05 2012 +0200
+++ b/main.c	Sun Nov 11 19:08:21 2012 +0200
@@ -76,7 +76,8 @@
 {
     LOG_FILE   = 1,
     LOG_WINDOW = 2,
-    LOG_STAMP  = 4
+    LOG_STAMP  = 4,
+    LOG_FILE2  = 8
 };
 
 
@@ -253,11 +254,12 @@
 
     if (flags & LOG_FILE)
     {
-        nn_window_t *mwin = nnwin_main_window();
-        if (win != mwin)
-            printMsgFile(win, flags, tmpStr, buf);
+        printMsgFile(win != NULL ? win : nnwin_main_window(), flags, tmpStr, buf);
+    }
 
-        printMsgFile(mwin, flags, tmpStr, buf);
+    if (flags & LOG_FILE2)
+    {
+        printMsgFile(nnwin_main_window(), flags, tmpStr, buf);
     }
 
     if (!optDaemon && (flags & LOG_WINDOW))
@@ -335,7 +337,7 @@
         va_list ap;
 
         va_start(ap, fmt);
-        printMsgV(NULL, LOG_FILE|LOG_WINDOW, fmt, ap);
+        printMsgV(NULL, LOG_FILE | LOG_WINDOW, fmt, ap);
         va_end(ap);
     }
 }
@@ -446,11 +448,11 @@
 
                 if (win != NULL)
                 {
-                    printMsgF(win, isIgnored ? 0 : LOG_WINDOW,
+                    printMsgF(win, isIgnored ? LOG_FILE : (LOG_FILE | LOG_WINDOW),
                         "½5½<½%d½%s½5½>½0½ %s\n",
                         isMine ? 14 : 15, isMine ? optUserName : in_name, in_msg);
 
-                    printMsgF(NULL, LOG_FILE, "½11½%s½0½\n", h);
+                    printMsgF(NULL, LOG_FILE2, "½11½%s½0½\n", h);
                 }
                 else
                 {