# HG changeset patch
# User masneyb
# Date 1179538627 0
# Node ID f37091406523543f9637582830c7f484e86e4780
# Parent  70b7e6663a057770a2d4a75ee4b3e2e68698e922
2007-5-18 Brian Masney <masneyb@gftp.org>

        * lib/protocols.c (gftp_request_destroy) - initialize the
        request->server_type if the request structure isn't destroyed.

        * src/gtk/gftp-gtk.c (gftp_gtk_init_request) - don't create a new
        request structure.

        * src/gtk/gtkui.c (gftpui_disconnect) - don't free the request
        structure.

diff -r 70b7e6663a05 -r f37091406523 ChangeLog
--- a/ChangeLog	Sat May 19 01:15:05 2007 +0000
+++ b/ChangeLog	Sat May 19 01:37:07 2007 +0000
@@ -1,4 +1,13 @@
 2007-5-18 Brian Masney <masneyb@gftp.org>
+	* lib/protocols.c (gftp_request_destroy) - initialize the 
+	request->server_type if the request structure isn't destroyed.
+
+	* src/gtk/gftp-gtk.c (gftp_gtk_init_request) - don't create a new
+	request structure.
+
+	* src/gtk/gtkui.c (gftpui_disconnect) - don't free the request
+	structure.
+
 	* lib/protocols.c (gftp_fd_read, gftp_fd_write) - moved FD_ZERO calls
 	outside of the while loop.
 
diff -r 70b7e6663a05 -r f37091406523 lib/protocols.c
--- a/lib/protocols.c	Sat May 19 01:15:05 2007 +0000
+++ b/lib/protocols.c	Sat May 19 01:37:07 2007 +0000
@@ -79,6 +79,7 @@
     {
       request->datafd = -1;
       request->cachefd = -1;
+      request->server_type = GFTP_DIRTYPE_OTHER;
     }
 }
 
diff -r 70b7e6663a05 -r f37091406523 src/gtk/gftp-gtk.c
--- a/src/gtk/gftp-gtk.c	Sat May 19 01:15:05 2007 +0000
+++ b/src/gtk/gftp-gtk.c	Sat May 19 01:37:07 2007 +0000
@@ -765,7 +765,6 @@
 void
 gftp_gtk_init_request (gftp_window_data * wdata)
 {
-  wdata->request = gftp_request_new ();
   wdata->request->logging_function = ftp_log;
   wdata->filespec = g_malloc0 (2);
   *wdata->filespec = '*';
@@ -792,6 +791,7 @@
   titles[5] = _("Date");
   titles[6] = _("Attribs");
 
+  wdata->request = gftp_request_new ();
   gftp_gtk_init_request (wdata);
 
   parent = gtk_frame_new (NULL);
diff -r 70b7e6663a05 -r f37091406523 src/gtk/gtkui.c
--- a/src/gtk/gtkui.c	Sat May 19 01:15:05 2007 +0000
+++ b/src/gtk/gtkui.c	Sat May 19 01:37:07 2007 +0000
@@ -474,7 +474,7 @@
   remove_files_window (wdata);
 
   /* Free the request structure so that all old settings are purged. */
-  gftp_request_destroy (wdata->request, 1);
+  gftp_request_destroy (wdata->request, 0);
   gftp_gtk_init_request (wdata);
 
   update_window_info ();