diff src/text/textui.c @ 846:77660334b282

2006-11-2 Brian Masney <[e-mail]> * src/text/gftp-text.c src/text/gftp-text.h src/text/textui.c - use gftp_string_from_utf8() for the conversion between the various character sets.

--- a/src/text/textui.c	Fri Nov 03 03:02:51 2006 +0000
+++ b/src/text/textui.c	Fri Nov 03 03:07:44 2006 +0000
@@ -76,7 +76,8 @@
   char tempstr[256];
 
   gftp_set_username (request, 
-                     gftp_text_ask_question (_("Username [anonymous]:"), 1,
+                     gftp_text_ask_question (request,
+                                             _("Username [anonymous]:"), 1,
                                              tempstr, sizeof (tempstr)));
 }
 
@@ -88,7 +89,7 @@
   char tempstr[256];
 
   gftp_set_password (request,
-                     gftp_text_ask_question (_("Password:"), 0,
+                     gftp_text_ask_question (request, _("Password:"), 0,
                                              tempstr, sizeof (tempstr)));
 }
 
@@ -147,7 +148,7 @@
     
           g_snprintf (question, sizeof (question), _("%s already exists. (%s source size, %s destination size):\n(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%c)"), pos, srcsize, destsize, defaction);
 
-          gftp_text_ask_question (question, 1, &buf, 1);
+          gftp_text_ask_question (tdata->fromreq, question, 1, &buf, 1);
 
           switch (buf)
             {
@@ -261,7 +262,7 @@
 
   do
     {
-      gftp_text_ask_question (question, 1, buf, sizeof (buf));
+      gftp_text_ask_question (request, question, 1, buf, sizeof (buf));
       if (strcasecmp (buf, "yes") == 0)
         ret = 1;
       else if (strcasecmp (buf, "no") == 0)
@@ -283,7 +284,7 @@
 
   do
     {
-      gftp_text_ask_question (question, shown, buf, sizeof (buf));
+      gftp_text_ask_question (request, question, shown, buf, sizeof (buf));
     }
   while (*buf == '\0');