Mercurial > gftp.yaz
changeset 660:3bf77096052c
2005-1-16 Brian Masney <masneyb@gftp.org>
* src/gtk/dnd.c (openurl_get_drag_data) - if the client is busy with
the server, then don't process the drop request (closes #162773)
(from Aurelien Jarno <aurelien@aurel32.net>)
| author | masneyb |
|---|---|
| date | Sun, 16 Jan 2005 15:39:28 +0000 |
| parents | b8faf63b2e9b |
| children | 2e718fba351e |
| files | ChangeLog src/gtk/dnd.c |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 16 15:35:21 2005 +0000 +++ b/ChangeLog Sun Jan 16 15:39:28 2005 +0000 @@ -1,4 +1,8 @@ 2005-1-16 Brian Masney <masneyb@gftp.org> + * src/gtk/dnd.c (openurl_get_drag_data) - if the client is busy with + the server, then don't process the drop request (closes #162773) + (from Aurelien Jarno <aurelien@aurel32.net>) + * src/gtk/misc-gtk.c (MakeEditDialog, MakeYesNoDialog) - use g_malloc0() instead of g_malloc() to allocate the structures. This ensures that all of the pointers are initialized to NULL (closes @@ -3204,7 +3208,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.389 2005/01/16 15:35:20 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.390 2005/01/16 15:39:28 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/dnd.c Sun Jan 16 15:35:21 2005 +0000 +++ b/src/gtk/dnd.c Sun Jan 16 15:39:28 2005 +0000 @@ -116,6 +116,14 @@ gint y, GtkSelectionData * selection_data, guint info, guint32 clk_time, gpointer data) { + if (current_wdata->request->stopable) + { + ftp_log (gftp_logging_misc, NULL, + _("%s: Please hit the stop button first to do anything else\n"), + _("Connect")); + return; + } + if ((selection_data->length >= 0) && (selection_data->format == 8)) { if (GFTP_IS_CONNECTED (current_wdata->request))