gtk+ r19964 - in branches/gtk-2-12: . gtk

[federico svn gnome org]

Author: federico
Date: Wed Apr  2 17:53:07 2008
New Revision: 19964
URL: http://svn.gnome.org/viewvc/gtk+?rev=19964&view=rev

Log:
bgo492134 - fix tilde expansion in GtkFileSystemUnix

Signed-off-by: Federico Mena Quintero <federico gnu org>


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkfilesystemunix.c

Modified: branches/gtk-2-12/gtk/gtkfilesystemunix.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkfilesystemunix.c	(original)
+++ branches/gtk-2-12/gtk/gtkfilesystemunix.c	Wed Apr  2 17:53:07 2008
@@ -1470,10 +1470,11 @@
       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)
     return g_build_filename (home, G_DIR_SEPARATOR_S, slash + 1, NULL);
   else
-    return g_strdup (home);
+    return g_build_filename (home, G_DIR_SEPARATOR_S, NULL);
 }
 
 static gboolean