diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-02-19 09:47:30 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-02-19 09:47:30 +0000 |
| commit | 40ff74bc3e7ce64d63dafcfb57052caae0b5344d (patch) | |
| tree | d99ab60bd531990a7c86325cd1e3d644f1e25a5f /daemon/gvfsbackendtrash.c | |
| parent | b64547deb808046b8bac687242ab777c0bf0d73a (diff) | |
| download | gvfs-40ff74bc3e7ce64d63dafcfb57052caae0b5344d.tar.gz | |
Some more cleanup.
2008-02-19 Alexander Larsson <alexl@redhat.com>
* daemon/gvfsbackendsftp.c:
* daemon/gvfsbackendtrash.c:
* gconf/gapplookupgconf.c:
* test/benchmark-common.c:
Some more cleanup.
svn path=/trunk/; revision=1303
Diffstat (limited to 'daemon/gvfsbackendtrash.c')
| -rw-r--r-- | daemon/gvfsbackendtrash.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c index 6a26f52e..10e883a6 100644 --- a/daemon/gvfsbackendtrash.c +++ b/daemon/gvfsbackendtrash.c @@ -201,8 +201,9 @@ unescape_pathname (const char *escaped_dir, int len) { char *trashname; trashname = g_strndup (escaped_dir + 1, len - 1); - return g_build_filename (g_get_user_data_dir (), "Trash", trashname, NULL); + dir = g_build_filename (g_get_user_data_dir (), "Trash", trashname, NULL); g_free (trashname); + return dir; } dir = g_malloc (len + 1 + 1); @@ -553,7 +554,7 @@ list_trash_dirs (void) if (info & HAS_SYSTEM_DIR) { - basename = g_strdup_printf ("%d", getuid()); + basename = g_strdup_printf ("%u", getuid()); trashdir = g_build_filename (topdir, ".Trash", basename, NULL); g_free (basename); dirs = g_list_prepend (dirs, trashdir); @@ -561,7 +562,7 @@ list_trash_dirs (void) if (info & HAS_USER_DIR) { - basename = g_strdup_printf (".Trash-%d", getuid()); + basename = g_strdup_printf (".Trash-%u", getuid()); trashdir = g_build_filename (topdir, basename, NULL); g_free (basename); dirs = g_list_prepend (dirs, trashdir); |