gftp.yaz: src/gtk/transfer.c comparison

comparison src/gtk/transfer.c @ 341:eedc2c5727fa

2003-12-28 Brian Masney <masneyb@gftp.org> **** NOTE: this commit breaks a lot of functionality in gftp. I **** **** still have more work to do on this. Please don't email me **** **** saying that the CVS code is broken. **** * lib/bookmark.c lib/gftp.h lib/local.c lib/options.h lib/rfc2068.c lib/rfc959.c lib/sshv2.c - moved the use_threads option from the request structure over to the protocol declaration in options.h. * lib/options.h src/gtk/gftp-gtk.c - added cmd_in_gui option. When this option is enabled, a new toolbar will be shown in the GTK+ port that will allow you to control the GUI by entering manual commands. * src/Makefile.am - added uicommon directory * src/gtk/Makefile.am src/text/Makefile.am - link in the uicommon library. * src/uicommon/* src/text/gftp-text.c - moved most of the functionality of the text port over to the uicommon directory. Made this code a little more generic so that the GTK+ port can have a text interface associated with it. * src/gtk/gtkui.c src/gtk/gftp-gtk.c src/gtk/mkdir_dialog.c src/gtk/rename_dialog.c src/gtk/menu-items.c src/gtk/misc-gtk.c - started to clean up the callback functions and make them more tightly integrated with the uicommon code. * src/gtk/bookmarks.c src/gtk/chmod_dialog.c src/gtk/delete_dialog.c src/gtk/gftp-gtk.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/transfer.c - s/refresh/gftpui_refresh/g s/jmp_environment/gftpui_common_jmp_environment/g s/request->use_threads/gftpui_common_use_threads (request)/g * src/gtk/options_dialog.c (apply_changes) - whenever the options are saved, check to see if the command entry needs to be shown or hidden.

author	masneyb
date	Sun, 28 Dec 2003 16:02:07 +0000
parents	cdabbe5c9a95
children	60d3da6ab336

comparison

equal deleted inserted replaced

-:c45fdcb87667
+:eedc2c5727fa
 gftp_file * fle;
 GList * files;
 request = data;
-if (request->use_threads)
+if (gftpui_common_use_threads (request))
 {
-sj = sigsetjmp (jmp_environment, 1);
+sj = sigsetjmp (gftpui_common_jmp_environment, 1);
-use_jmp_environment = 1;
+gftpui_common_use_jmp_environment = 1;
 }
 else
 sj = 0;
 files = NULL;
 if (sj == 0 || sj == 2)
 {
 if (gftp_list_files (request) != 0 || !GFTP_IS_CONNECTED (request))
 {
-if (request->use_threads)
+if (gftpui_common_use_threads (request))
-use_jmp_environment = 0;
+gftpui_common_use_jmp_environment = 0;
 request->stopable = 0;
 if (request->wakeup_main_thread[1] > 0)
 write (request->wakeup_main_thread[1], " ", 1);
 return (NULL);
 }
 g_free (fle);
 if (!GFTP_IS_CONNECTED (request))
 {
-if (request->use_threads)
+if (gftpui_common_use_threads (request))
-use_jmp_environment = 0;
+gftpui_common_use_jmp_environment = 0;
 request->stopable = 0;
 if (request->wakeup_main_thread[1] > 0)
 write (request->wakeup_main_thread[1], " ", 1);
 return (NULL);
 fle->isdir = 1;
 files = g_list_prepend (files, fle);
 }
 }
-if (request->use_threads)
+if (gftpui_common_use_threads (request))
-use_jmp_environment = 0;
+gftpui_common_use_jmp_environment = 0;
 request->stopable = 0;
 if (request->wakeup_main_thread[1] > 0)
 write (request->wakeup_main_thread[1], " ", 1);
 return (files);
 if (check_reconnect (wdata) < 0)
 return (0);
 gtk_clist_freeze (GTK_CLIST (wdata->listbox));
 wdata->request->stopable = 1;
-if (wdata->request->use_threads)
+if (gftpui_common_use_threads (wdata->request))
 {
 gtk_widget_set_sensitive (stop_btn, 1);
 handler = setup_wakeup_main_thread (wdata->request);
 pthread_create (&wdata->tid, NULL, getdir_thread, wdata->request);
 gftp_lookup_request_option (request, "retries", &retries);
 gftp_lookup_request_option (request, "sleep_time", &sleep_time);
 gftp_lookup_request_option (request, "network_timeout", &network_timeout);
 conn_num = 0;
-if (request->use_threads)
+if (gftpui_common_use_threads (request))
 {
-sj = sigsetjmp (jmp_environment, 1);
+sj = sigsetjmp (gftpui_common_jmp_environment, 1);
-use_jmp_environment = 1;
+gftpui_common_use_jmp_environment = 1;
 }
 else
 sj = 0;
 ret = 0;
 alarm (sleep_time);
 pause ();
 }
 }
-if (request->use_threads)
+if (gftpui_common_use_threads (request))
-use_jmp_environment = 0;
+gftpui_common_use_jmp_environment = 0;
 request->stopable = 0;
 if (request->wakeup_main_thread[1] > 0)
 write (request->wakeup_main_thread[1], " ", 1);
 return (GINT_TO_POINTER (ret));
 }
 else
 gftp_set_password (request, "");
 }
-if (wdata && wdata->request == request && request->use_threads)
+if (wdata && wdata->request == request && gftpui_common_use_threads (request))
 {
 request->stopable = 1;
 if (wdata)
 gtk_clist_freeze (GTK_CLIST (wdata->listbox));
 gtk_widget_set_sensitive (stop_btn, 1);
 if (transfer->files != NULL)
 {
 gftp_swap_socks (transfer->fromreq, fromwdata->request);
 gftp_swap_socks (transfer->toreq, towdata->request);
-if (transfer->fromreq->use_threads ||
+if (gftpui_common_use_threads (transfer->fromreq) ||
-(transfer->toreq && transfer->toreq->use_threads))
+(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);
 gftp_transfer * transfer;
 int success, sj;
 transfer = data;
-if (transfer->fromreq->use_threads ||
+if (gftpui_common_use_threads (transfer->fromreq) ||
-(transfer->toreq && transfer->toreq->use_threads))
+(transfer->toreq && gftpui_common_use_threads (transfer->toreq)))
 {
-sj = sigsetjmp (jmp_environment, 1);
+sj = sigsetjmp (gftpui_common_jmp_environment, 1);
-use_jmp_environment = 1;
+gftpui_common_use_jmp_environment = 1;
 }
 else
 sj = 0;
 success = 0;
 transfer->fromreq->logging_function (gftp_logging_error,
 transfer->fromreq,
 _("Operation canceled\n"));
 }
-if (transfer->fromreq->use_threads ||
+if (gftpui_common_use_threads (transfer->fromreq) ||
-(transfer->toreq && transfer->toreq->use_threads))
+(transfer->toreq && gftpui_common_use_threads (transfer->toreq)))
-use_jmp_environment = 0;
+gftpui_common_use_jmp_environment = 0;
 transfer->fromreq->stopable = 0;
 return (GINT_TO_POINTER (success));
 }
 gftp_lookup_request_option (tdata->fromreq, "refresh_files", &refresh_files);
 if (refresh_files && tdata->curfle && tdata->curfle->next &&
 compare_request (tdata->toreq,
 ((gftp_window_data *) tdata->towdata)->request, 1))
-refresh (tdata->towdata);
+gftpui_refresh (tdata->towdata);
 }
 static void
 get_trans_password (gftp_request * request, gftp_dialog_data * ddata)
 else
 	gftp_disconnect (tdata->toreq);
 if (tdata->towdata != NULL && compare_request (tdata->toreq,
 ((gftp_window_data *) tdata->towdata)->request, 1))
-refresh (tdata->towdata);
+gftpui_refresh (tdata->towdata);
 num_transfers_in_progress--;
 }
 if (!tdata->show && tdata->started)

Mercurial > gftp.yaz

comparison src/gtk/transfer.c @ 341:eedc2c5727fa