diff src/gtk/transfer.c @ 186:13ca1defdc75

2003-6-16 Brian Masney <[e-mail]> * lib/gftp.h src/text/gftp-text.c src/gtk/misc-gtk.c - changed 2nd parameter of logging function to be a request structure, instead of request->user_data. In the logging functions, if the string isn't in UTF-8, convert it with gftp_string_to_utf8() * lib/bookmark.c lib/cache.c lib/gftp.h lib/https.c lib/local.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c lib/sslcommon.c src/gtk/chmod_dialog.c src/gtk/delete_dialog.c src/gtk/gftp-gtk.h src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/mkdir_dialog.c src/gtk/rename_dialog.c src/gtk/transfer.c src/text/gftp-text.c src/gtk/gftp-gtk.h src/text/gftp-text.h - pass request structure to logging function instead of request->user_data

--- a/src/gtk/transfer.c	Tue Jun 17 10:13:26 2003 +0000
+++ b/src/gtk/transfer.c	Tue Jun 17 10:49:16 2003 +0000
@@ -278,7 +278,7 @@
         }
       else if (retries == 0 || conn_num < retries)
         {
-          request->logging_function (gftp_logging_misc, request->user_data,
+          request->logging_function (gftp_logging_misc, request,
                      _("Waiting %d seconds until trying to connect again\n"),
 		     sleep_time);
           alarm (sleep_time);
@@ -528,7 +528,7 @@
       if (transfer->toreq)
         gftp_disconnect (transfer->toreq);
       transfer->fromreq->logging_function (gftp_logging_error,
-                                           transfer->fromreq->user_data,
+                                           transfer->fromreq,
                                            _("Operation canceled\n"));
     }
 
@@ -640,7 +640,7 @@
           !GFTP_IS_CONNECTED (transfer->toreq))
         {
           transfer->fromreq->logging_function (gftp_logging_misc, 
-                         transfer->fromreq->user_data, 
+                         transfer->fromreq, 
                          _("Error: Remote site disconnected after trying to transfer file\n"));
         }
       else if (fromsize < 0)
@@ -697,7 +697,7 @@
       else if (num_read < 0)
         {
           transfer->fromreq->logging_function (gftp_logging_misc, 
-                                        transfer->fromreq->user_data, 
+                                        transfer->fromreq, 
                                         _("Could not download %s from %s\n"), 
                                         curfle->file,
                                         transfer->fromreq->hostname);
@@ -727,7 +727,7 @@
           gftp_end_transfer (transfer->toreq);
 
           transfer->fromreq->logging_function (gftp_logging_misc, 
-                         transfer->fromreq->user_data, 
+                         transfer->fromreq, 
                          _("Successfully transferred %s at %.2f KB/s\n"),
                          curfle->file, transfer->kbs);
         }