Commit 3e4c24c9 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Use the "system codepage" version of the directory name (not the UTF-8

2000-08-10  Tor Lillqvist  <tml@iki.fi>

	* gtk/gtkfilesel.c (open_new_dir): Use the "system codepage"
	version of the directory name (not the UTF-8 one) when building
	the path name to stat().
parent a6895b64
2000-08-10 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c (open_new_dir): Use the "system codepage"
version of the directory name (not the UTF-8 one) when building
the path name to stat().
2000-08-03 Elliot Lee <sopwith@redhat.com> 2000-08-03 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set. * gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
......
2000-08-10 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c (open_new_dir): Use the "system codepage"
version of the directory name (not the UTF-8 one) when building
the path name to stat().
2000-08-03 Elliot Lee <sopwith@redhat.com> 2000-08-03 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set. * gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
......
2000-08-10 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c (open_new_dir): Use the "system codepage"
version of the directory name (not the UTF-8 one) when building
the path name to stat().
2000-08-03 Elliot Lee <sopwith@redhat.com> 2000-08-03 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set. * gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
......
2000-08-10 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c (open_new_dir): Use the "system codepage"
version of the directory name (not the UTF-8 one) when building
the path name to stat().
2000-08-03 Elliot Lee <sopwith@redhat.com> 2000-08-03 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set. * gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
......
2000-08-10 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c (open_new_dir): Use the "system codepage"
version of the directory name (not the UTF-8 one) when building
the path name to stat().
2000-08-03 Elliot Lee <sopwith@redhat.com> 2000-08-03 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set. * gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
......
2000-08-10 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c (open_new_dir): Use the "system codepage"
version of the directory name (not the UTF-8 one) when building
the path name to stat().
2000-08-03 Elliot Lee <sopwith@redhat.com> 2000-08-03 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set. * gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
......
2000-08-10 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c (open_new_dir): Use the "system codepage"
version of the directory name (not the UTF-8 one) when building
the path name to stat().
2000-08-03 Elliot Lee <sopwith@redhat.com> 2000-08-03 Elliot Lee <sopwith@redhat.com>
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set. * gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
......
...@@ -2148,11 +2148,11 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs) ...@@ -2148,11 +2148,11 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs)
xdir = g_filename_from_utf8 (dir_name); xdir = g_filename_from_utf8 (dir_name);
directory = opendir(xdir); directory = opendir(xdir);
g_free (xdir);
if(!directory) if(!directory)
{ {
cmpl_errno = errno; cmpl_errno = errno;
g_free (xdir);
return NULL; return NULL;
} }
...@@ -2174,12 +2174,13 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs) ...@@ -2174,12 +2174,13 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs)
{ {
cmpl_errno = errno; cmpl_errno = errno;
closedir(directory); closedir(directory);
g_free (xdir);
return NULL; return NULL;
} }
sent->entries[i].entry_name = g_filename_to_utf8 (dirent_ptr->d_name); sent->entries[i].entry_name = g_filename_to_utf8 (dirent_ptr->d_name);
g_string_assign (path, dir_name); g_string_assign (path, xdir);
if (path->str[path->len-1] != G_DIR_SEPARATOR) if (path->str[path->len-1] != G_DIR_SEPARATOR)
{ {
g_string_append_c (path, G_DIR_SEPARATOR); g_string_append_c (path, G_DIR_SEPARATOR);
...@@ -2188,7 +2189,7 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs) ...@@ -2188,7 +2189,7 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs)
if (stat_subdirs) if (stat_subdirs)
{ {
if(stat(path->str, &ent_sbuf) >= 0 && S_ISDIR(ent_sbuf.st_mode)) if (stat (path->str, &ent_sbuf) >= 0 && S_ISDIR (ent_sbuf.st_mode))
sent->entries[i].is_dir = TRUE; sent->entries[i].is_dir = TRUE;
else else
/* stat may fail, and we don't mind, since it could be a /* stat may fail, and we don't mind, since it could be a
...@@ -2199,6 +2200,7 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs) ...@@ -2199,6 +2200,7 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs)
sent->entries[i].is_dir = 1; sent->entries[i].is_dir = 1;
} }
g_free (xdir);
g_string_free (path, TRUE); g_string_free (path, TRUE);
qsort(sent->entries, sent->entry_count, sizeof(CompletionDirEntry), compare_cmpl_dir); qsort(sent->entries, sent->entry_count, sizeof(CompletionDirEntry), compare_cmpl_dir);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment