callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bgo492134 - fix tilde expansion in GtkFileSystemUnix

Browse Source 
Signed-off-by: Federico Mena Quintero <federico@gnu.org>

svn path=/trunk/; revision=19962
This commit is contained in:
Federico Mena Quintero
2008-04-02 16:48:15 +00:00
committed by Federico Mena Quintero
parent 5f69cfa964
commit cf87b6f327
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2008-04-02 Federico Mena Quintero <federico@novell.com>
Fix http://bugzilla.gnome.org/show_bug.cgi?id=492134 - The file
chooser incorrectly substitutes and expands a ~ when you type it
in the filename entry.
* gtk/gtkfilesystemunix.c (expand_tilde): Ensure that empty
basenames result in a slash-terminated pathname.
gtk_file_system_unix_parse() is correct, but it was splitting
"/home/username" into path="/home" and file_part="username", which
is not what the caller wants when the entry has just "~" or
"~username".
2008-04-02 Tor Lillqvist <tml@novell.com> 2008-04-02 Tor Lillqvist <tml@novell.com>
* gtk/Makefile.am: Don't bother compiling gtksearchenginebeagle.c * gtk/Makefile.am: Don't bother compiling gtksearchenginebeagle.c

3
gtk/gtkfilesystemunix.c
View File

@ -1470,10 +1470,11 @@ expand_tilde (const char *filename)
home = passwd->pw_dir; home = passwd->pw_dir;
} }
/* We put G_DIR_SEPARATOR_S so that empty basenames will make the resulting path end in a slash */
if (slash) if (slash)
return g_build_filename (home, G_DIR_SEPARATOR_S, slash + 1, NULL); return g_build_filename (home, G_DIR_SEPARATOR_S, slash + 1, NULL);
else else
return g_strdup (home); return g_build_filename (home, G_DIR_SEPARATOR_S, NULL);
} }
static gboolean static gboolean