# HG changeset patch
# User masneyb
# Date 1073345902 0
# Node ID 2ea37b3c015890c9af564bd9946cbdd625b6dad7
# Parent  91d91f574438c99d0bb22c5e58c228d9d88440e8
2003-1-5 Brian Masney <masneyb@gftp.org>

        * lib/gftp.h src/gtk/misc-gtk.c src/text/gftp-text.c - added logging
        level type gftp_logging_misc_nolog. If a message is logged with this
        level, it will be displayed to the screen but, it will not be logged
        to disk.

        * src/uicommon/gftpui.c - log the directory listings with the log level
        gftp_logging_misc_nolog

        * src/gtk/gtkui.c (gftpui_generic_thread) - fixed segfault. Pass
        cdata structure instead of wdata.

diff -r 91d91f574438 -r 2ea37b3c0158 ChangeLog
--- a/ChangeLog	Mon Jan 05 21:18:24 2004 +0000
+++ b/ChangeLog	Mon Jan 05 23:38:22 2004 +0000
@@ -1,3 +1,15 @@
+2003-1-5 Brian Masney <masneyb@gftp.org>
+	* lib/gftp.h src/gtk/misc-gtk.c src/text/gftp-text.c - added logging
+	level type gftp_logging_misc_nolog. If a message is logged with this
+	level, it will be displayed to the screen but, it will not be logged
+	to disk.
+
+	* src/uicommon/gftpui.c - log the directory listings with the log level
+	gftp_logging_misc_nolog
+
+	* src/gtk/gtkui.c (gftpui_generic_thread) - fixed segfault. Pass
+	cdata structure instead of wdata.
+
 2003-1-4 Brian Masney <masneyb@gftp.org>
 	* src/text/Makefile.am src/gtk/Makefile.am - added @LIBINTL@ to LDADD
 	line of Makefile.am
@@ -1914,7 +1926,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.194 2004/01/04 17:52:42 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.195 2004/01/05 23:38:19 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 91d91f574438 -r 2ea37b3c0158 lib/gftp.h
--- a/lib/gftp.h	Mon Jan 05 21:18:24 2004 +0000
+++ b/lib/gftp.h	Mon Jan 05 23:38:22 2004 +0000
@@ -173,7 +173,8 @@
   gftp_logging_send,
   gftp_logging_recv,
   gftp_logging_error,
-  gftp_logging_misc
+  gftp_logging_misc,
+  gftp_logging_misc_nolog 	/* Log to the screen, but don't log to disk */
 } gftp_logging_level;
 
 typedef struct gftp_file_tag gftp_file;
diff -r 91d91f574438 -r 2ea37b3c0158 src/gtk/gtkui.c
--- a/src/gtk/gtkui.c	Mon Jan 05 21:18:24 2004 +0000
+++ b/src/gtk/gtkui.c	Mon Jan 05 23:38:22 2004 +0000
@@ -73,7 +73,7 @@
 
   wdata->request->stopable = 1;
   gtk_widget_set_sensitive (stop_btn, 1);
-  pthread_create (&wdata->tid, NULL, func, wdata);
+  pthread_create (&wdata->tid, NULL, func, cdata);
 
   while (wdata->request->stopable)
     {
diff -r 91d91f574438 -r 2ea37b3c0158 src/gtk/misc-gtk.c
--- a/src/gtk/misc-gtk.c	Mon Jan 05 21:18:24 2004 +0000
+++ b/src/gtk/misc-gtk.c	Mon Jan 05 23:38:22 2004 +0000
@@ -96,7 +96,7 @@
       return;
     }
 
-  if (gftp_logfd != NULL)
+  if (gftp_logfd != NULL && level != gftp_logging_misc_nolog)
     {
       if (fwrite (logstr, strlen (logstr), 1, gftp_logfd) != 1)
         {
diff -r 91d91f574438 -r 2ea37b3c0158 src/text/gftp-text.c
--- a/src/text/gftp-text.c	Mon Jan 05 21:18:24 2004 +0000
+++ b/src/text/gftp-text.c	Mon Jan 05 23:38:22 2004 +0000
@@ -84,7 +84,7 @@
   else
     outstr = tempstr;
 
-  if (gftp_logfd != NULL)
+  if (gftp_logfd != NULL && level != gftp_logging_misc_nolog)
     {
       fwrite (outstr, 1, strlen (outstr), gftp_logfd);
       if (ferror (gftp_logfd))
diff -r 91d91f574438 -r 2ea37b3c0158 src/uicommon/gftpui.c
--- a/src/uicommon/gftpui.c	Mon Jan 05 21:18:24 2004 +0000
+++ b/src/uicommon/gftpui.c	Mon Jan 05 23:38:22 2004 +0000
@@ -569,7 +569,8 @@
       gftpui_lookup_file_colors (fle, &startcolor, &endcolor);
       tempstr = gftp_gen_ls_string (fle, startcolor, endcolor);
 
-      request->logging_function (gftp_logging_misc, request, "%s\n", tempstr);
+      request->logging_function (gftp_logging_misc_nolog, request, "%s\n",
+                                 tempstr);
 
       g_free (tempstr);