Mercurial > gftp.yaz
changeset 470:a68273d9725a
2004-5-16 Brian Masney <masneyb@gftp.org>
* src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/transfer.c - fixed
detection of SIGCHLD when viewing/editing a file (from
Aurelien Jarno <aurelien@aurel32.net>)
* src/gtk/gtkui.c - expand the path on the client side when changing
the remote directory (i.e. CHDIR /home/.. becomes /home)
(from Aurelien Jarno <aurelien@aurel32.net>)
| author | masneyb |
|---|---|
| date | Sun, 16 May 2004 13:34:02 +0000 |
| parents | 2ad1916dc611 |
| children | f78b7f3b4919 |
| files | ChangeLog src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/gtkui.c src/gtk/transfer.c |
| diffstat | 5 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 16 12:52:12 2004 +0000 +++ b/ChangeLog Sun May 16 13:34:02 2004 +0000 @@ -1,4 +1,12 @@ 2004-5-16 Brian Masney <masneyb@gftp.org> + * src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/transfer.c - fixed + detection of SIGCHLD when viewing/editing a file (from + Aurelien Jarno <aurelien@aurel32.net>) + + * src/gtk/gtkui.c - expand the path on the client side when changing + the remote directory (i.e. CHDIR /home/.. becomes /home) + (from Aurelien Jarno <aurelien@aurel32.net>) + * src/uicommon/gftpui.c lib/gftp.h - added gftpui_protocol_update_timeout() @@ -2455,7 +2463,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.261 2004/05/16 12:52:12 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.262 2004/05/16 13:34:02 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/gftp-gtk.c Sun May 16 12:52:12 2004 +0000 +++ b/src/gtk/gftp-gtk.c Sun May 16 13:34:02 2004 +0000 @@ -39,7 +39,6 @@ gftp_graphic * gftp_icon; pthread_t main_thread_id; GList * viewedit_processes = NULL; -volatile sig_atomic_t viewedit_process_done; static int get_column (GtkCListColumn * col)
--- a/src/gtk/gftp-gtk.h Sun May 16 12:52:12 2004 +0000 +++ b/src/gtk/gftp-gtk.h Sun May 16 13:34:02 2004 +0000 @@ -186,7 +186,6 @@ extern gftp_graphic * gftp_icon; extern pthread_t main_thread_id; extern GList * viewedit_processes; -extern volatile sig_atomic_t viewedit_process_done; /* bookmarks.c */
--- a/src/gtk/gtkui.c Sun May 16 12:52:12 2004 +0000 +++ b/src/gtk/gtkui.c Sun May 16 13:34:02 2004 +0000 @@ -380,17 +380,22 @@ { gftpui_callback_data * cdata; gftp_window_data * wdata; + char *tempstr; int ret; + if ((tempstr = expand_path (directory)) == NULL) + return (FALSE); + wdata = uidata; cdata = g_malloc0 (sizeof (*cdata)); cdata->request = wdata->request; cdata->uidata = wdata; cdata->run_function = gftpui_common_run_chdir; - cdata->input_string = directory; + cdata->input_string = tempstr; ret = gftpui_common_run_callback_function (cdata); + g_free(tempstr); g_free (cdata); return (ret); }
--- a/src/gtk/transfer.c Sun May 16 12:52:12 2004 +0000 +++ b/src/gtk/transfer.c Sun May 16 13:34:02 2004 +0000 @@ -297,7 +297,7 @@ char *str; pid_t pid; - viewedit_process_done = 0; + gftpui_common_child_process_done = 0; while ((pid = waitpid (-1, &ret, WNOHANG)) > 0) { curdata = viewedit_processes; @@ -779,7 +779,7 @@ if (window2.request->gotbytes != 0) update_window_transfer_bytes (&window2); - if (viewedit_process_done) + if (gftpui_common_child_process_done) check_done_process (); for (templist = gftp_file_transfers; templist != NULL;)