# HG changeset patch
# User masneyb
# Date 1059165575 0
# Node ID 251845fc1ef1f7e9be2b0e16c4032bf76bcfdea3
# Parent  a5205627a66f5eca412755543823d5cda18cc4e0
2003-7-25 Brian Masney <masneyb@gftp.org>

        * src/gtk/transfer.c - changed looking up of overwrite_by_default to
        overwrite_default

        * src/text/gftp-text.h - fix for when the readline library was not
        found on the local system

diff -r a5205627a66f -r 251845fc1ef1 ChangeLog
--- a/ChangeLog	Fri Jul 25 20:22:04 2003 +0000
+++ b/ChangeLog	Fri Jul 25 20:39:35 2003 +0000
@@ -1,3 +1,10 @@
+2003-7-25 Brian Masney <masneyb@gftp.org>
+	* src/gtk/transfer.c - changed looking up of overwrite_by_default to
+	overwrite_default
+
+	* src/text/gftp-text.h - fix for when the readline library was not 
+	found on the local system
+
 2003-7-25 Brian Masney <masneyb@gftp.org>
         * lib/pty.c - prefer to use openpty() instead of grantpt() if it is
         available (for FreeBSD)
@@ -1366,7 +1373,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.118 2003/07/25 20:21:26 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.119 2003/07/25 20:39:34 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r a5205627a66f -r 251845fc1ef1 src/gtk/transfer.c
--- a/src/gtk/transfer.c	Fri Jul 25 20:22:04 2003 +0000
+++ b/src/gtk/transfer.c	Fri Jul 25 20:39:35 2003 +0000
@@ -1874,7 +1874,7 @@
   char *dltitles[4], *add_data[4] = { NULL, NULL, NULL, NULL },
        tempstr[50], temp1str[50], *pos, *title;
   GtkWidget * tempwid, * scroll, * hbox;
-  int i, overwrite_by_default;
+  int i, overwrite_default;
   gftp_file * tempfle;
   GList * templist;
   size_t len;
@@ -1943,8 +1943,8 @@
   gtk_widget_show (tdata->clist);
   gtk_widget_show (scroll);
 
-  gftp_lookup_request_option (tdata->fromreq, "overwrite_by_default",
-                              &overwrite_by_default);
+  gftp_lookup_request_option (tdata->fromreq, "overwrite_default",
+                              &overwrite_default);
 
   for (templist = tdata->files; templist != NULL; 
        templist = templist->next)
@@ -1963,7 +1963,7 @@
         pos = tempfle->destfile + len + 1;
       add_data[0] = pos;
 
-      if (overwrite_by_default)
+      if (overwrite_default)
         add_data[3] = _("Overwrite");
       else
         {
diff -r a5205627a66f -r 251845fc1ef1 src/text/gftp-text.h
--- a/src/text/gftp-text.h	Fri Jul 25 20:22:04 2003 +0000
+++ b/src/text/gftp-text.h	Fri Jul 25 20:39:35 2003 +0000
@@ -24,7 +24,7 @@
 
 #include "../../lib/gftp.h"
 
-#ifdef HAVE_LIBREADLINE
+#if HAVE_LIBREADLINE
 #include <readline/readline.h>
 #include <readline/history.h>
 #endif