AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Include "." and ".." in the list of entries; they are needed for correct

Browse Source 
Thu Dec 12 19:51:45 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkfilesel.c (open_new_dir): Include "."
        and ".." in the list of entries; they are needed for
        correct handling of .<TAB>, ..<TAB>; were lost
        with the GDir conversion. (Francisco Bustamante,
        #89972)

        * gtk/gtkfilesel.c (open_new_dir): If we hit
        EOF unexpectedly, that's OK... a file was just
        deleted while we were reading the directory.
This commit is contained in:
Owen Taylor 2002-12-13 01:06:55 +00:00 committed by Owen Taylor
parent e4fc95abb1
commit 829c6708f2
7 changed files with 82 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Thu Dec 12 19:51:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (open_new_dir): Include "."
and ".." in the list of entries; they are needed for
correct handling of .<TAB>, ..<TAB>; were lost
with the GDir conversion. (Francisco Bustamante,
#89972)
* gtk/gtkfilesel.c (open_new_dir): If we hit
EOF unexpectedly, that's OK... a file was just
deleted while we were reading the directory.
Thu Dec 12 18:02:34 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main_do_event): Intercept events

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
Thu Dec 12 19:51:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (open_new_dir): Include "."
and ".." in the list of entries; they are needed for
correct handling of .<TAB>, ..<TAB>; were lost
with the GDir conversion. (Francisco Bustamante,
#89972)
* gtk/gtkfilesel.c (open_new_dir): If we hit
EOF unexpectedly, that's OK... a file was just
deleted while we were reading the directory.
Thu Dec 12 18:02:34 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main_do_event): Intercept events

12
ChangeLog.pre-2-2
View File

@ -1,3 +1,15 @@
Thu Dec 12 19:51:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (open_new_dir): Include "."
and ".." in the list of entries; they are needed for
correct handling of .<TAB>, ..<TAB>; were lost
with the GDir conversion. (Francisco Bustamante,
#89972)
* gtk/gtkfilesel.c (open_new_dir): If we hit
EOF unexpectedly, that's OK... a file was just
deleted while we were reading the directory.
Thu Dec 12 18:02:34 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main_do_event): Intercept events

12
ChangeLog.pre-2-4
View File

@ -1,3 +1,15 @@
Thu Dec 12 19:51:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (open_new_dir): Include "."
and ".." in the list of entries; they are needed for
correct handling of .<TAB>, ..<TAB>; were lost
with the GDir conversion. (Francisco Bustamante,
#89972)
* gtk/gtkfilesel.c (open_new_dir): If we hit
EOF unexpectedly, that's OK... a file was just
deleted while we were reading the directory.
Thu Dec 12 18:02:34 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main_do_event): Intercept events

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
Thu Dec 12 19:51:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (open_new_dir): Include "."
and ".." in the list of entries; they are needed for
correct handling of .<TAB>, ..<TAB>; were lost
with the GDir conversion. (Francisco Bustamante,
#89972)
* gtk/gtkfilesel.c (open_new_dir): If we hit
EOF unexpectedly, that's OK... a file was just
deleted while we were reading the directory.
Thu Dec 12 18:02:34 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main_do_event): Intercept events

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
Thu Dec 12 19:51:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (open_new_dir): Include "."
and ".." in the list of entries; they are needed for
correct handling of .<TAB>, ..<TAB>; were lost
with the GDir conversion. (Francisco Bustamante,
#89972)
* gtk/gtkfilesel.c (open_new_dir): If we hit
EOF unexpectedly, that's OK... a file was just
deleted while we were reading the directory.
Thu Dec 12 18:02:34 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main_do_event): Intercept events

17
gtk/gtkfilesel.c
View File

@ -3048,6 +3048,8 @@ open_new_dir (gchar *dir_name,
while ((dirent = g_dir_read_name (directory)) != NULL)
entry_count++;
entry_count += 2; /* For ".",".." */
sent->entries = g_new (CompletionDirEntry, entry_count);
sent->entry_count = entry_count;
@ -3057,14 +3059,15 @@ open_new_dir (gchar *dir_name,
{
GError *error = NULL;
dirent = g_dir_read_name (directory);
if (!dirent)
if (i == 0)
dirent = ".";
else if (i == 1)
dirent = "..";
else
{
g_warning ("Failure reading folder '%s'", sys_dir_name);
g_dir_close (directory);
g_free (sys_dir_name);
return NULL;
dirent = g_dir_read_name (directory);
if (!dirent) /* Directory changed */
break;
}
sent->entries[n_entries].entry_name = g_filename_to_utf8 (dirent, -1, NULL, NULL, &error);