+Fri Dec 13 18:22:21 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (compare_cmpl_dir): Use
+ g_utf8_collate_key() to sort in human-friendly order.
+ (#94473)
+
Fri Dec 13 17:45:40 2002 Owen Taylor <otaylor@redhat.com>
* gtk/fnmatch.c gtk/gtkprivate.h gtk/gtkfilesel.c:
+Fri Dec 13 18:22:21 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (compare_cmpl_dir): Use
+ g_utf8_collate_key() to sort in human-friendly order.
+ (#94473)
+
Fri Dec 13 17:45:40 2002 Owen Taylor <otaylor@redhat.com>
* gtk/fnmatch.c gtk/gtkprivate.h gtk/gtkfilesel.c:
+Fri Dec 13 18:22:21 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (compare_cmpl_dir): Use
+ g_utf8_collate_key() to sort in human-friendly order.
+ (#94473)
+
Fri Dec 13 17:45:40 2002 Owen Taylor <otaylor@redhat.com>
* gtk/fnmatch.c gtk/gtkprivate.h gtk/gtkfilesel.c:
+Fri Dec 13 18:22:21 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (compare_cmpl_dir): Use
+ g_utf8_collate_key() to sort in human-friendly order.
+ (#94473)
+
Fri Dec 13 17:45:40 2002 Owen Taylor <otaylor@redhat.com>
* gtk/fnmatch.c gtk/gtkprivate.h gtk/gtkfilesel.c:
+Fri Dec 13 18:22:21 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (compare_cmpl_dir): Use
+ g_utf8_collate_key() to sort in human-friendly order.
+ (#94473)
+
Fri Dec 13 17:45:40 2002 Owen Taylor <otaylor@redhat.com>
* gtk/fnmatch.c gtk/gtkprivate.h gtk/gtkfilesel.c:
+Fri Dec 13 18:22:21 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (compare_cmpl_dir): Use
+ g_utf8_collate_key() to sort in human-friendly order.
+ (#94473)
+
Fri Dec 13 17:45:40 2002 Owen Taylor <otaylor@redhat.com>
* gtk/fnmatch.c gtk/gtkprivate.h gtk/gtkfilesel.c:
{
gboolean is_dir;
gchar *entry_name;
+ gchar *sort_key;
};
struct _CompletionUserDir
{
gint i;
for (i = 0; i < sent->entry_count; i++)
- g_free (sent->entries[i].entry_name);
+ {
+ g_free (sent->entries[i].entry_name);
+ g_free (sent->entries[i].sort_key);
+ }
g_free (sent->entries);
g_free (sent);
}
}
g_clear_error (&error);
+ sent->entries[n_entries].sort_key = g_utf8_collate_key (sent->entries[n_entries].entry_name, -1);
+
g_string_assign (path, sys_dir_name);
if (path->str[path->len-1] != G_DIR_SEPARATOR)
{
compare_cmpl_dir (const void *a,
const void *b)
{
- return compare_filenames ((((CompletionDirEntry*)a))->entry_name,
- (((CompletionDirEntry*)b))->entry_name);
+
+ return strcmp (((CompletionDirEntry*)a)->sort_key,
+ (((CompletionDirEntry*)b))->sort_key);
}
static gint