diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2010-05-19 12:51:11 +0200 |
|---|---|---|
| committer | Martyn Russell <martyn@lanedo.com> | 2010-05-20 16:18:31 +0100 |
| commit | aa2523fd2283b844c364af7379d74a58ce21cbc3 (patch) | |
| tree | 3add41c2783ae77387234b129fbbb73e2b6c081f | |
| parent | 4cac788ff72114cfb74312f3af8d711da2d91514 (diff) | |
| download | tracker-aa2523fd2283b844c364af7379d74a58ce21cbc3.tar.gz | |
Bug 614610 - config behaviour regarding xdg-user-dirs doesn't work properly.
Make $HOME take precedence over XDG dirs pointing to it when saving
directory aliases in the configuration file.
| -rw-r--r-- | src/miners/fs/tracker-config.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c index ff347179c..0bea3b4d8 100644 --- a/src/miners/fs/tracker-config.c +++ b/src/miners/fs/tracker-config.c @@ -1005,7 +1005,12 @@ config_save (TrackerConfig *config) * breaks. Need a better * solution at some point. */ - if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0) { + if (g_strcmp0 (l->data, g_get_home_dir ()) == 0) { + /* Home dir gets straight into configuration, + * regardless of having XDG dirs pointing to it. + */ + path_to_use = "$HOME"; + } else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0) { path_to_use = "&DESKTOP"; } else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS)) == 0) { path_to_use = "&DOCUMENTS"; |