From 02e2fcbec4a9d66cfb985479fd0cdcaa372bc0b8 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 2 Aug 2012 07:51:46 +0000
Subject: [PATCH] move "favorites" desktop entries to base data

SVN revision: 74787
---
 configure.ac                                              | 1 +
 data/Makefile.am                                          | 1 +
 {src/modules/wizard/data => data}/favorites/.order        | 0
 .../wizard/data => data}/favorites/desktop.desktop        | 0
 {src/modules/wizard/data => data}/favorites/home.desktop  | 0
 {src/modules/wizard/data => data}/favorites/root.desktop  | 0
 {src/modules/wizard/data => data}/favorites/tmp.desktop   | 0
 src/modules/wizard/Makefile.am                            | 8 --------
 src/modules/wizard/page_160.c                             | 5 ++---
 9 files changed, 4 insertions(+), 11 deletions(-)
 rename {src/modules/wizard/data => data}/favorites/.order (100%)
 rename {src/modules/wizard/data => data}/favorites/desktop.desktop (100%)
 rename {src/modules/wizard/data => data}/favorites/home.desktop (100%)
 rename {src/modules/wizard/data => data}/favorites/root.desktop (100%)
 rename {src/modules/wizard/data => data}/favorites/tmp.desktop (100%)

diff --git a/configure.ac b/configure.ac
index c1861202f..e4f558b24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/data/Makefile.am b/data/Makefile.am
index ffc3ec062..f320e9deb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,4 +9,5 @@ etc \
 icons \
 backgrounds \
 flags \
+favorites \
 desktop
diff --git a/src/modules/wizard/data/favorites/.order b/data/favorites/.order
similarity index 100%
rename from src/modules/wizard/data/favorites/.order
rename to data/favorites/.order
diff --git a/src/modules/wizard/data/favorites/desktop.desktop b/data/favorites/desktop.desktop
similarity index 100%
rename from src/modules/wizard/data/favorites/desktop.desktop
rename to data/favorites/desktop.desktop
diff --git a/src/modules/wizard/data/favorites/home.desktop b/data/favorites/home.desktop
similarity index 100%
rename from src/modules/wizard/data/favorites/home.desktop
rename to data/favorites/home.desktop
diff --git a/src/modules/wizard/data/favorites/root.desktop b/data/favorites/root.desktop
similarity index 100%
rename from src/modules/wizard/data/favorites/root.desktop
rename to data/favorites/root.desktop
diff --git a/src/modules/wizard/data/favorites/tmp.desktop b/data/favorites/tmp.desktop
similarity index 100%
rename from src/modules/wizard/data/favorites/tmp.desktop
rename to data/favorites/tmp.desktop
diff --git a/src/modules/wizard/Makefile.am b/src/modules/wizard/Makefile.am
index b4705ed1d..133abf437 100644
--- a/src/modules/wizard/Makefile.am
+++ b/src/modules/wizard/Makefile.am
@@ -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 \
diff --git a/src/modules/wizard/page_160.c b/src/modules/wizard/page_160.c
index f62eb5828..5baf2e98e 100644
--- a/src/modules/wizard/page_160.c
+++ b/src/modules/wizard/page_160.c
@@ -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);