# HG changeset patch
# User masneyb
# Date 1089544536 0
# Node ID 937f2b75bbeee6dea8e3b74b074682dcb2be71ae
# Parent  b6edffb505941d9519fafdd029b2e02d8c1bbbbe
2004-7-11 Brian Masney <masneyb@gftp.org>

        * src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/gtkui.c
        src/gtk/transfer.c - removed use_cache argument to ftp_list_files()
        This was not being used

        * src/gtk/gftp-gtk.c - compile fix when compiling against GTK 1.2

diff -r b6edffb50594 -r 937f2b75bbee ChangeLog
--- a/ChangeLog	Wed Jul 07 16:27:47 2004 +0000
+++ b/ChangeLog	Sun Jul 11 11:15:36 2004 +0000
@@ -1,3 +1,10 @@
+2004-7-11 Brian Masney <masneyb@gftp.org>
+	* src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/gtkui.c 
+	src/gtk/transfer.c - removed use_cache argument to ftp_list_files()
+	This was not being used
+
+	* src/gtk/gftp-gtk.c - compile fix when compiling against GTK 1.2
+
 2004-7-6 Brian Masney <masneyb@gftp.org>
 	* lib/sshv2.c - added sshv2_wrong_message(). Changed the wrong message
 	log messages to call this function instead
@@ -2527,7 +2534,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.274 2004/07/07 01:52:16 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.275 2004/07/11 11:15:36 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r b6edffb50594 -r 937f2b75bbee src/gtk/gftp-gtk.c
--- a/src/gtk/gftp-gtk.c	Wed Jul 07 16:27:47 2004 +0000
+++ b/src/gtk/gftp-gtk.c	Sun Jul 11 11:15:36 2004 +0000
@@ -1228,7 +1228,10 @@
   gftpui_common_init (&argc, &argv, ftp_log);
 
   g_thread_init (NULL);
+
+#if GTK_MAJOR_VERSION > 1
   gdk_threads_init();
+#endif
 
   main_thread_id = pthread_self ();
   gtk_set_locale ();
@@ -1269,7 +1272,7 @@
     {
       gftp_setup_startup_directory (window1.request);
       gftp_connect (window1.request);
-      ftp_list_files (&window1, 0);
+      ftp_list_files (&window1);
     }
 
   /* On the remote window, even though we aren't connected, draw the sort
diff -r b6edffb50594 -r 937f2b75bbee src/gtk/gftp-gtk.h
--- a/src/gtk/gftp-gtk.h	Wed Jul 07 16:27:47 2004 +0000
+++ b/src/gtk/gftp-gtk.h	Sun Jul 11 11:15:36 2004 +0000
@@ -385,8 +385,7 @@
 void gftp_gtk_save_bookmark_options 		( gftp_bookmarks_var * bm );
 
 /* transfer.c */
-int ftp_list_files				( gftp_window_data * wdata,
-						  int usecache );
+int ftp_list_files				( gftp_window_data * wdata );
 
 int ftp_connect					( gftp_window_data * wdata,
 						  gftp_request * request,
diff -r b6edffb50594 -r 937f2b75bbee src/gtk/gtkui.c
--- a/src/gtk/gtkui.c	Wed Jul 07 16:27:47 2004 +0000
+++ b/src/gtk/gtkui.c	Sun Jul 11 11:15:36 2004 +0000
@@ -57,7 +57,7 @@
   gtk_clist_freeze (GTK_CLIST (wdata->listbox));
   remove_files_window (wdata);
   gftp_delete_cache_entry (wdata->request, NULL, 0);
-  ftp_list_files (wdata, 0);
+  ftp_list_files (wdata);
   gtk_clist_thaw (GTK_CLIST (wdata->listbox));
 }
 
diff -r b6edffb50594 -r 937f2b75bbee src/gtk/transfer.c
--- a/src/gtk/transfer.c	Wed Jul 07 16:27:47 2004 +0000
+++ b/src/gtk/transfer.c	Sun Jul 11 11:15:36 2004 +0000
@@ -23,7 +23,7 @@
 static int num_transfers_in_progress = 0;
 
 int
-ftp_list_files (gftp_window_data * wdata, int usecache)
+ftp_list_files (gftp_window_data * wdata)
 {
   gftpui_callback_data * cdata;