Mercurial > gftp.yaz

changeset 506:5944bd059ae0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-7-19 Brian Masney <masneyb@gftp.org> * src/gtk/delete_dialog.c src/gtk/transfer.c src/gtk/gftp-gtk.h - added gftp_gtk_get_subdirs() to get the list of subdirectories in a child thread
author masneyb
date Mon, 19 Jul 2004 23:09:23 +0000
parents c89019945241
children 34a4c6ec453c
files ChangeLog src/gtk/delete_dialog.c src/gtk/gftp-gtk.h src/gtk/transfer.c
diffstat 4 files changed, 75 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jul 19 22:41:42 2004 +0000
+++ b/ChangeLog	Mon Jul 19 23:09:23 2004 +0000
@@ -1,4 +1,8 @@
 2004-7-19 Brian Masney <masneyb@gftp.org>
+	* src/gtk/delete_dialog.c src/gtk/transfer.c src/gtk/gftp-gtk.h -
+	added gftp_gtk_get_subdirs() to get the list of subdirectories in a
+	child thread
+
 	* src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h - renamed some functions so that
 	they are clearer on what they do. Did some small code cleanups
 
@@ -2584,7 +2588,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.283 2004/07/19 22:41:42 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.284 2004/07/19 23:09:23 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/src/gtk/delete_dialog.c	Mon Jul 19 22:41:42 2004 +0000
+++ b/src/gtk/delete_dialog.c	Mon Jul 19 23:09:23 2004 +0000
@@ -168,9 +168,7 @@
   GList * templist, * filelist;
   gftp_transfer * transfer;
   gftp_window_data * wdata;
-  long numfiles, numdirs;
-  int num, timeout_num;
-  void *ret;
+  int num, ret;
 
   wdata = data;
   if (!check_status (_("Delete"), wdata, gftpui_common_use_threads (wdata->request), 0, 1, 1))
@@ -202,38 +200,7 @@
 
   gftp_swap_socks (transfer->fromreq, wdata->request);
 
-  if (gftpui_common_use_threads (transfer->fromreq))
-    {
-      wdata->request->stopable = 1;
-      transfer->fromreq->stopable = 1;
-      gtk_widget_set_sensitive (stop_btn, 1);
-      pthread_create (&wdata->tid, NULL, do_getdir_thread, transfer);
-
-      timeout_num = gtk_timeout_add (100, progress_timeout, transfer);
-      while (transfer->fromreq->stopable)
-        {
-          GDK_THREADS_LEAVE ();
-#if GTK_MAJOR_VERSION == 1
-          g_main_iteration (TRUE);
-#else
-          g_main_context_iteration (NULL, TRUE);
-#endif
-        }
-
-      gtk_widget_set_sensitive (stop_btn, 0);
-      gtk_timeout_remove (timeout_num);
-      numfiles = transfer->numfiles;
-      numdirs = transfer->numdirs;
-      transfer->numfiles = transfer->numdirs = -1;
-      update_directory_download_progress (transfer);
-      transfer->numfiles = numfiles;
-      transfer->numdirs = numdirs;
-
-      pthread_join (wdata->tid, &ret);
-      wdata->request->stopable = 0;
-    }
-  else
-    ret = do_getdir_thread (transfer);
+  ret = gftp_gtk_get_subdirs (transfer, &wdata->tid);
 
   if (!GFTP_IS_CONNECTED (transfer->fromreq))
     {
@@ -243,6 +210,9 @@
 
   gftp_swap_socks (wdata->request, transfer->fromreq);
 
+  if (!ret)
+    return;
+
   askdel (transfer);
 }
 
--- a/src/gtk/gftp-gtk.h	Mon Jul 19 22:41:42 2004 +0000
+++ b/src/gtk/gftp-gtk.h	Mon Jul 19 23:09:23 2004 +0000
@@ -405,6 +405,9 @@
 void transfer_window_files 			( gftp_window_data * fromwdata,
 						  gftp_window_data * towdata );
 
+int gftp_gtk_get_subdirs 			( gftp_transfer * transfer,
+						  pthread_t *tid );
+
 void *do_getdir_thread 				( void * data );
 
 void start_transfer				( gpointer data );
--- a/src/gtk/transfer.c	Mon Jul 19 22:41:42 2004 +0000
+++ b/src/gtk/transfer.c	Mon Jul 19 23:09:23 2004 +0000
@@ -85,9 +85,7 @@
   gftp_file * tempfle, * newfle;
   GList * templist, * filelist;
   gftp_transfer * transfer;
-  guint timeout_num;
-  void *ret;
-  int num;
+  int num, ret, disconnect;
 
   if (!check_status (_("Transfer Files"), fromwdata, 1, 0, 1,
        towdata->request->put_file != NULL && fromwdata->request->get_file != NULL))
@@ -129,44 +127,29 @@
       gftp_swap_socks (transfer->fromreq, fromwdata->request);
       gftp_swap_socks (transfer->toreq, towdata->request);
 
-      if (gftpui_common_use_threads (transfer->fromreq) || 
-          (transfer->toreq && gftpui_common_use_threads (transfer->toreq)))
-        {
-          transfer->fromreq->stopable = 1;
-          pthread_create (&fromwdata->tid, NULL, do_getdir_thread, transfer);
-
-          timeout_num = gtk_timeout_add (100, progress_timeout, transfer);
-
-          while (transfer->fromreq->stopable)
-            {
-              GDK_THREADS_LEAVE ();
-#if GTK_MAJOR_VERSION == 1
-              g_main_iteration (TRUE);
-#else
-              g_main_context_iteration (NULL, TRUE);
-#endif
-            }
-
-          gtk_timeout_remove (timeout_num);
-          transfer->numfiles = transfer->numdirs = -1; 
-          update_directory_download_progress (transfer);
-
-          pthread_join (fromwdata->tid, &ret);
-        }
+      ret = gftp_gtk_get_subdirs (transfer, &fromwdata->tid);
+      if (ret < 0)
+        disconnect = 1;
       else
-        ret = do_getdir_thread (transfer);
+        disconnect = 0;
 
       if (!GFTP_IS_CONNECTED (transfer->fromreq))
         {
           gftpui_disconnect (fromwdata);
-          return;
+          disconnect = 1;
         } 
 
       if (!GFTP_IS_CONNECTED (transfer->toreq))
         {
           gftpui_disconnect (towdata);
+          disconnect = 1;
+        } 
+
+      if (disconnect)
+        {
+          free_tdata (transfer);
           return;
-        } 
+        }
 
       gftp_swap_socks (fromwdata->request, transfer->fromreq);
       gftp_swap_socks (towdata->request, transfer->toreq);
@@ -183,8 +166,9 @@
     free_tdata (transfer);
 }
 
-void *
-do_getdir_thread (void * data)
+
+static void *
+_gftp_getdir_thread (void * data)
 {
   gftp_transfer * transfer;
   int success, sj;
@@ -222,6 +206,52 @@
 }
 
 
+int
+gftp_gtk_get_subdirs (gftp_transfer * transfer, pthread_t *tid)
+{
+  long numfiles, numdirs;
+  guint timeout_num;
+  void *ret;
+
+  if (gftpui_common_use_threads (transfer->fromreq) || 
+      (transfer->toreq && gftpui_common_use_threads (transfer->toreq)))
+    {
+      transfer->fromreq->stopable = 1;
+      gtk_widget_set_sensitive (stop_btn, 1);
+
+      pthread_create (tid, NULL, _gftp_getdir_thread, transfer);
+
+      timeout_num = gtk_timeout_add (100, progress_timeout, transfer);
+
+      while (transfer->fromreq->stopable)
+        {
+          GDK_THREADS_LEAVE ();
+#if GTK_MAJOR_VERSION == 1
+          g_main_iteration (TRUE);
+#else
+          g_main_context_iteration (NULL, TRUE);
+#endif
+        }
+
+      gtk_widget_set_sensitive (stop_btn, 0);
+      gtk_timeout_remove (timeout_num);
+
+      numfiles = transfer->numfiles;
+      numdirs = transfer->numdirs;
+      transfer->numfiles = transfer->numdirs = -1; 
+      update_directory_download_progress (transfer);
+      transfer->numfiles = numfiles;
+      transfer->numdirs = numdirs;
+
+      pthread_join (*tid, &ret);
+    }
+  else
+    ret = _gftp_getdir_thread (transfer);
+
+  return (GPOINTER_TO_INT (ret));
+}
+
+
 static void
 remove_file (char *filename)
 {