[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

Re: [gftp] PASV/PORT issue still happening



On Wed, Mar 17, 2004 at 10:16:49AM -0500, Tracer Bullet wrote:
> On Wed, 2004-03-17 at 08:00, Brian Masney wrote:
> 
> > 
> > I have attached a small patch that fixes this.
> > 
> 
> Worked like a charm.  Thank you very much, Brian!
> 
> Is there any chance you could tell me what source files I should look
> through to create a patch to bring back the "Start transfers
> immeadiately" option?

Here is a patch that adds this option back. I can add an icon to the tool bar if
you can find a free icon that I can use to represent starting transfers. If
you're interested, look at the gnome-stock collection.

Brian


Index: lib/options.h
===================================================================
RCS file: /cvs/gnome/gftp/lib/options.h,v
retrieving revision 1.27
diff -u -r1.27 options.h
--- lib/options.h	17 Mar 2004 13:44:43 -0000	1.27
+++ lib/options.h	17 Mar 2004 20:27:58 -0000
@@ -88,6 +88,10 @@
   {"show_trans_in_title", N_("Show transfer status in title"), 
    gftp_option_type_checkbox, GINT_TO_POINTER(0), NULL, 0,
    N_("Show the file transfer status in the titlebar"), GFTP_PORT_GTK, NULL},
+  {"start_transfers", N_("Start file transfers"), 
+   gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, 0,
+   N_("Automatically start the file transfers when they get queued"),
+   GFTP_PORT_GTK, NULL},
   {"cmd_in_gui", N_("Allow manual commands in GUI"), 
    gftp_option_type_checkbox, GINT_TO_POINTER(0), NULL, 0,
    N_("Allow entering manual commands in the GUI (functions like the text port)"), GFTP_PORT_GTK, NULL},
cvs diff: Diffing src
cvs diff: Diffing src/gtk
Index: src/gtk/transfer.c
===================================================================
RCS file: /cvs/gnome/gftp/src/gtk/transfer.c,v
retrieving revision 1.57
diff -u -r1.57 transfer.c
--- src/gtk/transfer.c	8 Feb 2004 16:19:16 -0000	1.57
+++ src/gtk/transfer.c	17 Mar 2004 20:27:59 -0000
@@ -766,7 +766,7 @@
 gint
 update_downloads (gpointer data)
 {
-  intptr_t do_one_transfer_at_a_time;
+  intptr_t do_one_transfer_at_a_time, start_transfers;
   GList * templist, * next;
   gftp_transfer * tdata;
 
@@ -805,8 +805,9 @@
 	    {
               gftp_lookup_global_option ("one_transfer", 
                                          &do_one_transfer_at_a_time);
+              gftp_lookup_global_option ("start_transfers", &start_transfers);
 
-	      if (!tdata->started && 
+	      if (!tdata->started && start_transfers &&
                  (num_transfers_in_progress == 0 || !do_one_transfer_at_a_time))
                 create_transfer (tdata);