diff src/gtk/delete_dialog.c @ 525:7262851e3ae8

2004-8-1 Brian Masney <[e-mail]> * lib/sshv2.c - treat all integers from the remote server as unsigned * src/gtk/delete_dialog.c - fixed memory leak * src/gtk/chmod_dialog.c src/gtk/delete_dialog.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/gtkui.c src/gtk/menu-items.c src/gtk/transfer.c - added gftp_gtk_get_list_selection() macro

--- a/src/gtk/delete_dialog.c	Sat Jul 31 12:06:51 2004 +0000
+++ b/src/gtk/delete_dialog.c	Sun Aug 01 11:03:39 2004 +0000
@@ -21,6 +21,13 @@
 static const char cvsid[] = "$Id$";
 
 static void
+_gftp_gtk_free_del_data (gftp_transfer * transfer, gftp_dialog_data * ddata)
+{
+  free_tdata (transfer);
+}
+
+
+static void
 yesCB (gftp_transfer * transfer, gftp_dialog_data * ddata)
 {
   gftpui_callback_data * cdata;
@@ -40,7 +47,7 @@
   gftpui_common_run_callback_function (cdata);
 
   g_free (cdata);
-  /* FIXME free_tdata (transfer); */
+  _gftp_gtk_free_del_data (transfer, ddata);
 }
 
 
@@ -65,7 +72,7 @@
     return;
 
   MakeYesNoDialog (_("Delete Files/Directories"), tempstr, 
-                   yesCB, transfer, NULL, NULL);
+                   yesCB, transfer, _gftp_gtk_free_del_data, transfer);
   g_free (tempstr);
 }
 
@@ -89,7 +96,7 @@
   transfer->fromwdata = wdata;
 
   num = 0;
-  templist = GTK_CLIST (wdata->listbox)->selection;
+  templist = gftp_gtk_get_list_selection (wdata);
   filelist = wdata->files;
   while (templist != NULL)
     {
@@ -112,14 +119,14 @@
 
   ret = gftp_gtk_get_subdirs (transfer, &wdata->tid);
 
-  if (!GFTP_IS_CONNECTED (transfer->fromreq))
+  gftp_swap_socks (wdata->request, transfer->fromreq);
+
+  if (!GFTP_IS_CONNECTED (wdata->request))
     {
       gftpui_disconnect (wdata);
       return;
     }
 
-  gftp_swap_socks (wdata->request, transfer->fromreq);
-
   if (!ret)
     return;