move "favorites" desktop entries to base data

SVN revision: 74787
devs/princeamd/enlightenment-0.17-elive
Mike Blumenkrantz 11 years ago
parent 031fc80e2f
commit 02e2fcbec4
  1. 1
      configure.ac
  2. 1
      data/Makefile.am
  3. 0
      data/favorites/.order
  4. 0
      data/favorites/desktop.desktop
  5. 0
      data/favorites/home.desktop
  6. 0
      data/favorites/root.desktop
  7. 0
      data/favorites/tmp.desktop
  8. 8
      src/modules/wizard/Makefile.am
  9. 5
      src/modules/wizard/page_160.c

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

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

@ -11,14 +11,6 @@ desks_DATA = \
data/extra_desktops/mplayer.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
desktop_DATA = \
data/desktop/home.desktop \

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

Loading…
Cancel
Save