From 4de7b95f4a5c9e557b79022167763bd6c162510d Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Mon, 26 Nov 2012 08:45:03 +0000 Subject: [PATCH] e: honor XDG_DESKTOP_DIR SVN revision: 79678 --- src/bin/e_fm_device.c | 29 +++++++++++------------------ src/modules/wizard/page_160.c | 7 +++---- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/bin/e_fm_device.c b/src/bin/e_fm_device.c index 71a63d2ede..aea15d8388 100644 --- a/src/bin/e_fm_device.c +++ b/src/bin/e_fm_device.c @@ -319,9 +319,8 @@ _e_fm2_volume_write(E_Volume *v) if (e_config->device_desktop) { - e_user_homedir_snprintf(buf2, sizeof(buf2), - "%s/|%s_%d.desktop", - _("Desktop"), id, v->partition_number); + snprintf(buf2, sizeof(buf2), "%s/|%s_%d.desktop", + efreet_desktop_dir_get(), id, v->partition_number); ecore_file_symlink(buf, buf2); } @@ -341,8 +340,8 @@ _e_fm2_volume_erase(E_Volume *v) id = ecore_file_file_get(v->storage->udi); if (e_config->device_desktop) { - e_user_homedir_snprintf(buf, sizeof(buf), "%s/|%s_%d.desktop", - _("Desktop"), id, v->partition_number); + snprintf(buf, sizeof(buf), "%s/|%s_%d.desktop", + efreet_desktop_dir_get(), id, v->partition_number); ecore_file_unlink(buf); _e_fm2_file_force_update(buf); } @@ -648,10 +647,7 @@ _e_fm2_device_check_desktop_icons_list_cb(const char *name, const char *path, vo static void _e_fm2_device_check_desktop_icons_cb(void *data, Ecore_Thread *eth __UNUSED__) { - char buf[PATH_MAX]; - - e_user_homedir_concat_static(buf, _("Desktop")); - eina_file_dir_list(buf, EINA_FALSE, _e_fm2_device_check_desktop_icons_list_cb, data); + eina_file_dir_list(efreet_desktop_dir_get(), EINA_FALSE, _e_fm2_device_check_desktop_icons_list_cb, data); E_FREE_LIST(data, free); } @@ -683,9 +679,8 @@ e_fm2_device_show_desktop_icons(void) "fileman/favorites/|%s_%d.desktop", id, v->partition_number); - e_user_homedir_snprintf(buf2, sizeof(buf2), - "%s/|%s_%d.desktop", - _("Desktop"), id, v->partition_number); + snprintf(buf2, sizeof(buf2), "%s/|%s_%d.desktop", + efreet_desktop_dir_get(), id, v->partition_number); if (ecore_file_exists(buf) && !ecore_file_exists(buf2)) { @@ -717,9 +712,8 @@ e_fm2_device_hide_desktop_icons(void) id = ecore_file_file_get(v->storage->udi); - e_user_homedir_snprintf(buf, sizeof(buf), - "%s/|%s_%d.desktop", - _("Desktop"), id, v->partition_number); + snprintf(buf, sizeof(buf), "%s/|%s_%d.desktop", + efreet_desktop_dir_get(), id, v->partition_number); if (ecore_file_exists(buf)) { @@ -745,9 +739,8 @@ e_fm2_device_check_desktop_icons(void) id = ecore_file_file_get(v->storage->udi); - e_user_homedir_snprintf(buf, sizeof(buf), - "%s/|%s_%d.desktop", - _("Desktop"), id, v->partition_number); + snprintf(buf, sizeof(buf), "%s/|%s_%d.desktop", + efreet_desktop_dir_get(), id, v->partition_number); thd = eina_list_append(thd, strdup(buf)); } _check_vols = ecore_thread_run(_e_fm2_device_check_desktop_icons_cb, _e_fm2_device_check_desktop_icons_cb_end, _e_fm2_device_check_desktop_icons_cb_end, thd); diff --git a/src/modules/wizard/page_160.c b/src/modules/wizard/page_160.c index 908f3a6238..841af63c4a 100644 --- a/src/modules/wizard/page_160.c +++ b/src/modules/wizard/page_160.c @@ -21,8 +21,7 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) char buf[PATH_MAX], buf2[PATH_MAX], *file; // make desktop dir - e_user_homedir_concat(buf, sizeof(buf), _("Desktop")); - ecore_file_mkpath(buf); + ecore_file_mkpath(efreet_desktop_dir_get()); snprintf(buf, sizeof(buf), "%s/desktop", e_wizard_dir_get()); files = ecore_file_ls(buf); if (!files) return 0; @@ -30,8 +29,8 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) { snprintf(buf, sizeof(buf), "%s/desktop/%s", e_wizard_dir_get(), file); - snprintf(buf2, sizeof(buf2), "%s/%s/%s", - e_user_homedir_get(), _("Desktop"), file); + snprintf(buf2, sizeof(buf2), "%s/%s", + efreet_desktop_dir_get(), file); ecore_file_cp(buf, buf2); free(file); } -- 2.34.1