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

[gftp] Re: Fw: Re: gFTP: gFTP 2.0.15rc1 has been released



On Fri, Jul 25, 2003 at 06:00:47PM +0200, Oliver Lehmann wrote:
> FYI:
> 
> (the "apply -> ok -> coredump" seems to be a common error)

This is fixed in CVS. I've also attached a patch.

Brian


? Makefile
? Makefile.in
? gftp-gtk
Index: options_dialog.c
===================================================================
RCS file: /cvs/gnome/gftp/src/gtk/options_dialog.c,v
retrieving revision 1.16
diff -u -r1.16 options_dialog.c
--- options_dialog.c	23 Jul 2003 02:39:24 -0000	1.16
+++ options_dialog.c	30 Jul 2003 00:56:27 -0000
@@ -427,21 +427,6 @@
 
 
 static void
-_cancel_option_type_textcomboedt (gftp_config_vars * cv, void *user_data)
-{
-  gftp_textcomboedt_widget_data * widdata;
-
-  widdata = cv->user_data;
-  if (widdata != NULL)
-    {
-      if (widdata->custom_edit_value != NULL)
-        g_free (widdata->custom_edit_value);
-      g_free (widdata);
-    }
-}
-
-
-static void
 _save_option_type_textcomboedt (gftp_config_vars * cv, void *user_data)
 {
   gftp_textcomboedt_widget_data * widdata;
@@ -492,8 +477,6 @@
 
   if (freeit)
     g_free (newstr);
-
-  _cancel_option_type_textcomboedt (cv, user_data);
 }
 
 
@@ -669,6 +652,30 @@
 static void
 clean_old_changes (GtkWidget * widget, gpointer data)
 {
+  gftp_textcomboedt_widget_data * widdata;
+  gftp_config_vars * cv;
+  GList * templist;
+  int i;
+
+  for (templist = gftp_options_list;
+       templist != NULL;
+       templist = templist->next)
+    {
+      cv = templist->data;
+
+      for (i=0; cv[i].key != NULL; i++)
+        {
+          widdata = cv->user_data;
+          if (widdata != NULL)
+            {
+              if (widdata->custom_edit_value != NULL)
+                g_free (widdata->custom_edit_value);
+              g_free (widdata);
+              cv->user_data = NULL;
+            }
+        }
+    }
+
   if (new_proxy_hosts != NULL)
     {
       gftp_free_proxy_hosts (new_proxy_hosts);
@@ -1205,7 +1212,7 @@
   _setup_option (gftp_option_type_textcomboedt, option_data, 
                  _print_option_type_textcomboedt, 
                  _save_option_type_textcomboedt,
-                 _cancel_option_type_textcomboedt);
+                 NULL);
   _setup_option (gftp_option_type_hidetext, option_data, 
                  _print_option_type_hidetext, _save_option_type_text, NULL);
   _setup_option (gftp_option_type_int, option_data,