comparison src/gtk/gtkui.c @ 380:05ee37a5558b

2003-1-28 Brian Masney <[e-mail]> * src/gtk/bookmarks.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/gtkui.c src/gtk/menu-items.c src/gtk/transfer.c - renamed disconnect() to gftpui_disconnect() * src/gtk/gtkui.c src/text/textui.c src/uicommon/gftpui.c - improved prompting for the username/password * src/gtk/gtkui.c src/text/textui.c src/uicommon/gftpui.c - call gftpui_disconnect() after a command is run and if we are no longer connected to the remote host * src/text/gftp-text.c - parse the command line arguments for the host to connect to * src/text/textui.c (gftpui_refresh) - clear the cache. (gftpui_ask_transfer) - check for carriage return or empty string * src/uicommon/gftp.h - define gftpui_common_cmd_m{get,put}_file() * lib/sshv2.c - removed temporary "fix"

379:c9aa122a1b92

#define _GFTPUI_GTK_USER_PW_SIZE	256

static void 
_gftpui_gtk_try_connect_again (char *tempstr, gftp_dialog_data * ddata)
{
  strncpy (tempstr, gtk_entry_get_text (GTK_ENTRY (ddata->edit)),
           _GFTPUI_GTK_USER_PW_SIZE);
  /* FIXME request->stopable = 0; */
}


static void
_gftpui_gtk_dont_connect_again (char *tempstr, gftp_dialog_data * ddata)
{
  /* FIXME request->stopable = 0; */
}


char *
gftpui_prompt_username (void *uidata, gftp_request * request)
{
  char tempstr[_GFTPUI_GTK_USER_PW_SIZE];

  MakeEditDialog (_("Enter Username"),
                  _("Please enter your username for this site"), NULL,
                  0, NULL, gftp_dialog_button_connect,
                  _gftpui_gtk_try_connect_again, tempstr,
                  _gftpui_gtk_dont_connect_again, tempstr);

  *tempstr = '\0';
  while (*tempstr == '\0') /* FIXME */
    {
      GDK_THREADS_LEAVE ();
#if GTK_MAJOR_VERSION == 1
      g_main_iteration (TRUE);
#else
      g_main_context_iteration (NULL, TRUE);
#endif
    }

  if (*tempstr == '\0')
    return (NULL);
  else
    return (g_strdup (tempstr));
}


char *
gftpui_prompt_password (void *uidata, gftp_request * request)
{
  char tempstr[_GFTPUI_GTK_USER_PW_SIZE];

  MakeEditDialog (_("Enter Password"),
                  _("Please enter your password for this site"), NULL,
                  0, NULL, gftp_dialog_button_connect,
                  _gftpui_gtk_try_connect_again, tempstr,
                  _gftpui_gtk_dont_connect_again, tempstr);

  *tempstr = '\0';
  while (*tempstr == '\0') /* FIXME */
    {
      GDK_THREADS_LEAVE ();
#if GTK_MAJOR_VERSION == 1
      g_main_iteration (TRUE);
#else
      g_main_context_iteration (NULL, TRUE);
#endif
    }

  if (*tempstr == '\0')
    return (NULL);
  else
    return (g_strdup (tempstr));
}


/* The wakeup main thread functions are so that after the thread terminates
   there won't be a delay in updating the GUI */

  pthread_join (wdata->tid, &ret);
  gtk_widget_set_sensitive (stop_btn, 0);

  if (!GFTP_IS_CONNECTED (wdata->request))
    disconnect (wdata);

  return (ret);
}

  tempstr = gftp_build_path (wdata->request->directory, curfle->file, NULL);
  gftpui_run_chdir (wdata, tempstr);
  g_free (tempstr);
}

380:05ee37a5558b

#define _GFTPUI_GTK_USER_PW_SIZE	256

static void 
_gftpui_gtk_set_username (gftp_request * request, gftp_dialog_data * ddata)
{
  gftp_set_username (request, gtk_entry_get_text (GTK_ENTRY (ddata->edit)));
  request->stopable = 0;
}


static void 
_gftpui_gtk_set_password (gftp_request * request, gftp_dialog_data * ddata)
{
  gftp_set_password (request, gtk_entry_get_text (GTK_ENTRY (ddata->edit)));
  request->stopable = 0;
}


static void
_gftpui_gtk_abort (gftp_request * request, gftp_dialog_data * ddata)
{
  request->stopable = 0;
}


void
gftpui_prompt_username (void *uidata, gftp_request * request)
{
  MakeEditDialog (_("Enter Username"),
                  _("Please enter your username for this site"), NULL,
                  0, NULL, gftp_dialog_button_connect,
                  _gftpui_gtk_set_username, request,
                  _gftpui_gtk_abort, request);

  request->stopable = 1;
  while (request->stopable)
    {
      GDK_THREADS_LEAVE ();
#if GTK_MAJOR_VERSION == 1
      g_main_iteration (TRUE);
#else
      g_main_context_iteration (NULL, TRUE);
#endif
    }
}


void
gftpui_prompt_password (void *uidata, gftp_request * request)
{
  MakeEditDialog (_("Enter Password"),
                  _("Please enter your password for this site"), NULL,
                  0, NULL, gftp_dialog_button_connect,
                  _gftpui_gtk_set_password, request,
                  _gftpui_gtk_abort, request);

  request->stopable = 1;
  while (request->stopable)
    {
      GDK_THREADS_LEAVE ();
#if GTK_MAJOR_VERSION == 1
      g_main_iteration (TRUE);
#else
      g_main_context_iteration (NULL, TRUE);
#endif
    }
}


/* The wakeup main thread functions are so that after the thread terminates
   there won't be a delay in updating the GUI */

  pthread_join (wdata->tid, &ret);
  gtk_widget_set_sensitive (stop_btn, 0);

  if (!GFTP_IS_CONNECTED (wdata->request))
    gftpui_disconnect (wdata);

  return (ret);
}

  tempstr = gftp_build_path (wdata->request->directory, curfle->file, NULL);
  gftpui_run_chdir (wdata, tempstr);
  g_free (tempstr);
}


void 
gftpui_disconnect (void *uidata)
{
  gftp_window_data * wdata;

  wdata = uidata;
  gftp_delete_cache_entry (wdata->request, NULL, 1);
  gftp_disconnect (wdata->request);
  remove_files_window (wdata);
  update_window (wdata);
}