diff lib/protocols.c @ 198:8fea1b1a2ec6

2003-6-22 Brian Masney <[e-mail]> * lib/config_file.c lib/gftp.h - renamed parse_args to gftp_config_parse_args() and removed the static declaration * lib/protocols.c (gftp_request_destroy) - fixed memory problem with the new local configuration interface * src/gtk/gftp-gtk.c - added gftp_gtk_config_(read|write)_color(). I am overriding the read and write functions for gftp_option_type_color to be these functions. This is so that I can use a GdkColor structure instead of a gftp_color structure * src/gtk/misc-gtk.c - when destroying the dialogs, set the pointers to NULL before we call the callback functions. This is to make sure that they aren't being used in the callbacks * TODO - updated

--- a/lib/protocols.c	Sun Jun 22 22:54:02 2003 +0000
+++ b/lib/protocols.c	Mon Jun 23 01:07:05 2003 +0000
@@ -64,6 +64,12 @@
   if (request->protocol_data)
     g_free (request->protocol_data);
 
+  if (request->local_options_vars != NULL)
+    {
+      g_free (request->local_options_vars);
+      g_hash_table_destroy (request->local_options_hash);
+    }
+
   memset (request, 0, sizeof (*request));
 
   if (free_request)
@@ -73,12 +79,6 @@
       request->datafd = -1;
       request->cachefd = -1;
     }
-
-  if (request->local_options_vars != NULL)
-    {
-      g_free (request->local_options_vars);
-      g_hash_table_destroy (request->local_options_hash);
-    }
 }