diff src/gtk/delete_dialog.c @ 19:3b2dcdefc7e9

2002-09-15 Brian Masney <[e-mail]> * lib/gftp.h (struct gftp_transfer) - changed the type of numfiles and numdirs from unsigned long to long. This must be a signed field. This is a bug I introduced a few days ago. * lib/local.c (local_put_file) - remove the + off of the ab mode to fdopen. This is also a bug I introduced a few days ago. * src/gtk/transfer.c (gftp_gtk_calc_kbs) - make sure that the variable difftime isn't a negative number when computing the KB/s * src/gtk/menu-items.c (save_directory_listing) - remove casts to GTK_OBJECT for the str variable * src/gtk/gftp-gtk.c - use GTK_STOCK_* icons in place of left.xpm, right.xpm, up.xpm, down.xpm and stop.xpm in GTK+ 2.0 port * src/gtk/bookmarks.c - show GTK_STOCK_* icons on the popup menu * src/gtk/bookmarks.c, src/gtk/chmod_dialog.c, src/gtk/menu-items.c, src/gtk/misc-gtk.c, src/gtk/options_dialog.c and src/gtk/view_dialog.c - use gtk_dialog_new_with_buttons in GTK+ 2.0 port to create the dialog. Also, associate gFTP icon with this dialog * src/gtk/misc-gtk.c - changed the interface of MakeEditDialog and MakeYesNoDialog. In the GTK+ 2.0 port, I now use stock icons in the dialog buttons.

--- a/src/gtk/delete_dialog.c	Wed Sep 11 10:26:13 2002 +0000
+++ b/src/gtk/delete_dialog.c	Mon Sep 16 12:27:50 2002 +0000
@@ -20,9 +20,8 @@
 #include "gftp-gtk.h"
 
 static void askdel 				( gftp_transfer * transfer );
-static void yes_dialog_cb 			( GtkWidget * widget, 
-						  gpointer data );
-static void yesCB 				( gftp_transfer * transfer );
+static void yesCB 				( gftp_transfer * transfer,
+						  gftp_dialog_data * ddata );
 static void * do_delete_thread 			( void *data );
 static void delete_purge_cache 			( gpointer key, 
 						  gpointer value, 
@@ -118,25 +117,14 @@
 
   tempstr = g_strdup_printf (_("Are you sure you want to delete these %ld files and %ld directories"), transfer->numfiles, transfer->numdirs);
 
-  MakeYesNoDialog (_("Delete Files/Directories"), tempstr, 0, 2, _("Yes"),
-		   yes_dialog_cb, transfer, _("No"), NULL, NULL);
+  MakeYesNoDialog (_("Delete Files/Directories"), tempstr, 
+                   yesCB, transfer, NULL, NULL);
   g_free (tempstr);
 }
 
 
 static void
-yes_dialog_cb (GtkWidget * widget, gpointer data)
-{
-  gftp_dialog_data * dialog;
-
-  dialog = data;
-  gtk_widget_destroy (dialog->dialog);
-  yesCB (dialog->data);
-}
-
-
-static void
-yesCB (gftp_transfer * transfer)
+yesCB (gftp_transfer * transfer, gftp_dialog_data * ddata)
 {
   gftp_window_data * wdata;
   void * ret;