diff src/uicommon/gftpui.c @ 422:38bfc112ab46

2004-3-14 Brian Masney <[e-mail]> * lib/misc.c (expand_path) - skip over paths that are empty * lib/misc.c (gftp_sort_filelist) - fixed NULL pointer dereference that would occur when attempting to sort an empty filelist (from Hans-J?rgen Sch?ler <[e-mail]>) * src/uicommon/gftpui.c (_gftpui_common_thread_callback) - fix so that retries would occur properly after a timeout (from Nam SungHyun <[e-mail]>) * src/gtk/Makefile.am - removed unneeded localedir defination (from Nam SungHyun <[e-mail]>) * lib/gftp.h lib/protocols.c src/gtk/gftp-gtk.c src/text/gftp-text.c - added gftp_setup_startup_directory(). This function will expand the startup directory so that ~ directories will work properly * lib/rfc959.c - removed invalid response error message if the user enters an invalid password * src/gtk/bookmarks.c - only allow one bookmark entry to be edited at a time. This is a design flaw in my code and I'll remove this restriction until I have time to recode this. Also, fixed segfault that would occur when renaming a bookmark * src/gtk/view_dialog.c - when editing a file, make sure the file has the right suffix so that syntax highlighting works

--- a/src/uicommon/gftpui.c	Wed Mar 10 17:54:33 2004 +0000
+++ b/src/uicommon/gftpui.c	Mon Mar 15 18:07:15 2004 +0000
@@ -45,7 +45,7 @@
   gftpui_common_use_jmp_environment = 1;
 
   success = GFTP_ERETRYABLE;
-  if (sj == 0)
+  if (sj != 1)
     {
       while (1)
         {
@@ -57,12 +57,12 @@
           if (success == GFTP_EFATAL || success == 0 || cdata->retries == 0)
             break;
 
+          cdata->retries--;
           cdata->request->logging_function (gftp_logging_misc, cdata->request,
                        _("Waiting %d seconds until trying to connect again\n"),
                        sleep_time);
           alarm (sleep_time);
           pause ();
-          cdata->retries--;
         }
     }
   else
@@ -579,7 +579,7 @@
 
       gftpui_lookup_file_colors (fle, &startcolor, &endcolor);
       tempstr = gftp_gen_ls_string (fle, startcolor, endcolor);
-      request->logging_function (gftp_logging_misc_nolog, request, "%s\n",
+      request->logging_function (gftp_logging_misc_nolog, request, "%s",
                                  tempstr);
       g_free (tempstr);