comparison lib/protocols.c @ 45:311e29c40ed6

2002-10-31 Brian Masney <[e-mail]> * src/gtk/*.[ch] - don't check for gtk+ version based on the minor version. May cause problems later on. * lib/protocols.c src/gtk/bookmarks.c src/gtk/misc-gtk.c - use UTF8 functions for user data when using glib 2.0

44:9c0825c047e7

int
gftp_get_next_file (gftp_request * request, char *filespec, gftp_file * fle)
{
  FILE * fd;
  int ret;

  g_return_val_if_fail (request != NULL, -2);

  if (request->get_next_file == NULL)
    return (-2);

  memset (fle, 0, sizeof (*fle));
  do
    {
      gftp_file_destroy (fle);
      ret = request->get_next_file (request, fle, fd);

      if (ret >= 0 && !request->cached && request->cachefd != NULL && 
          request->last_dir_entry != NULL)
        {
          fwrite (request->last_dir_entry, 1, request->last_dir_entry_len, 

45:311e29c40ed6

int
gftp_get_next_file (gftp_request * request, char *filespec, gftp_file * fle)
{
  FILE * fd;
  int ret;
#if GLIB_MAJOR_VERSION > 1
  gsize bread, bwrite;
  char *tempstr;
#endif

  g_return_val_if_fail (request != NULL, -2);

  if (request->get_next_file == NULL)
    return (-2);

  memset (fle, 0, sizeof (*fle));
  do
    {
      gftp_file_destroy (fle);
      ret = request->get_next_file (request, fle, fd);

#if GLIB_MAJOR_VERSION > 1
      if (fle->file != NULL && !g_utf8_validate (fle->file, -1, NULL))
        {
          if ((tempstr = g_locale_to_utf8 (fle->file, -1, &bread, 
                                           &bwrite, NULL)) != NULL)
            {
              g_free (fle->file);
              fle->file = tempstr;
            }
          else if ((tempstr = g_filename_to_utf8 (fle->file, -1, &bread, 
                                                  &bwrite, NULL)) != NULL)
            {
              g_free (fle->file);
              fle->file = tempstr;
            }

        }
#endif

      if (ret >= 0 && !request->cached && request->cachefd != NULL && 
          request->last_dir_entry != NULL)
        {
          fwrite (request->last_dir_entry, 1, request->last_dir_entry_len,