move "favorites" desktop entries to base data

SVN revision: 74787
This commit is contained in:
Mike Blumenkrantz 2012-08-02 07:51:46 +00:00
parent 031fc80e2f
commit 02e2fcbec4
9 changed files with 4 additions and 11 deletions

View File

@ -1038,6 +1038,7 @@ src/preload/Makefile
data/Makefile data/Makefile
data/images/Makefile data/images/Makefile
data/flags/Makefile data/flags/Makefile
data/favorites/Makefile
data/desktop/Makefile data/desktop/Makefile
data/input_methods/Makefile data/input_methods/Makefile
data/themes/Makefile data/themes/Makefile

View File

@ -9,4 +9,5 @@ etc \
icons \ icons \
backgrounds \ backgrounds \
flags \ flags \
favorites \
desktop desktop

View File

@ -11,14 +11,6 @@ desks_DATA = \
data/extra_desktops/mplayer.desktop \ data/extra_desktops/mplayer.desktop \
data/extra_desktops/xterm.desktop data/extra_desktops/xterm.desktop
favsdir = $(libdir)/enlightenment/modules/$(MODULE)/favorites
favs_DATA = \
data/favorites/.order \
data/favorites/desktop.desktop \
data/favorites/home.desktop \
data/favorites/root.desktop \
data/favorites/tmp.desktop
desktopdir = $(libdir)/enlightenment/modules/$(MODULE)/desktop desktopdir = $(libdir)/enlightenment/modules/$(MODULE)/desktop
desktop_DATA = \ desktop_DATA = \
data/desktop/home.desktop \ data/desktop/home.desktop \

View File

@ -23,13 +23,12 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
// make dir for favorites and install ones shipped // make dir for favorites and install ones shipped
snprintf(buf, sizeof(buf), "%s/fileman/favorites", e_user_dir_get()); snprintf(buf, sizeof(buf), "%s/fileman/favorites", e_user_dir_get());
ecore_file_mkpath(buf); ecore_file_mkpath(buf);
snprintf(buf, sizeof(buf), "%s/favorites", e_wizard_dir_get()); e_prefix_data_concat(buf, sizeof(buf), "data/favorites");
files = ecore_file_ls(buf); files = ecore_file_ls(buf);
if (!files) return 0; if (!files) return 0;
EINA_LIST_FREE(files, file) EINA_LIST_FREE(files, file)
{ {
snprintf(buf, sizeof(buf), "%s/favorites/%s", e_prefix_data_snprintf(buf, sizeof(buf), "data/favorites/%s", file);
e_wizard_dir_get(), file);
snprintf(buf2, sizeof(buf2), "%s/fileman/favorites/%s", snprintf(buf2, sizeof(buf2), "%s/fileman/favorites/%s",
e_user_dir_get(), file); e_user_dir_get(), file);
ecore_file_cp(buf, buf2); ecore_file_cp(buf, buf2);