Mercurial > gftp.yaz
changeset 354:2ea37b3c0158
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.
| author | masneyb |
|---|---|
| date | Mon, 05 Jan 2004 23:38:22 +0000 |
| parents | 91d91f574438 |
| children | 60d3da6ab336 |
| files | ChangeLog lib/gftp.h src/gtk/gtkui.c src/gtk/misc-gtk.c src/text/gftp-text.c src/uicommon/gftpui.c |
| diffstat | 6 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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;
--- 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) {
--- 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) {
--- 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))
--- 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);