Removed ~/.e/e/applications/all as it isn't used anymore. Correct dir is ~/.local/share/applications, so applications.tar.gz was parted into desktop_files.tar.gz which contains the .desktop files and is extracted to ~/.local/share/applications/ and desktop_order.tar.gz which contains the menu and bar files and is extracted to ~/.e/e/ .

SVN revision: 32052
This commit is contained in:
Miculcy Brian 2007-10-13 11:28:54 +00:00
parent 6e94d02361
commit 4b5a3d2a6d
4 changed files with 22 additions and 5 deletions

View File

@ -1,7 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/enlightenment/data/other
files_DATA = \
applications.tar.gz \
desktop_files.tar.gz \
desktop_order.tar.gz \
efm_favorites.tar.gz \
icon_example.tar.gz

Binary file not shown.

Binary file not shown.

View File

@ -1026,7 +1026,6 @@ _e_main_dirs_init(void)
"%s/.e/e/icons",
"%s/.e/e/backgrounds",
"%s/.e/e/applications",
"%s/.e/e/applications/all",
"%s/.e/e/applications/menu",
"%s/.e/e/applications/menu/favorite",
"%s/.e/e/applications/menu/all",
@ -1057,6 +1056,17 @@ _e_main_dirs_init(void)
}
}
}
snprintf(buf, sizeof(buf), "%s/applications", efreet_data_home_get());
if (!ecore_file_mkpath(buf))
{
if (!ecore_file_is_dir(buf))
{
e_error_message_show("Error creating directory:\n"
"%s",
buf);
return 0;
}
}
/* FIXME: THIS is a hack to get people started!!! */
/* err dont just disable it - replace it with a proper wizard tool */
@ -1066,8 +1076,14 @@ _e_main_dirs_init(void)
if (!ecore_file_exists(buf))
{
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/applications.tar.gz | "
"(cd %s/.e/e/ ; tar -xf -)",
"gzip -d -c < %s/data/other/desktop_files.tar.gz | "
"(cd %s/applications/ ; tar -xkf -)",
e_prefix_data_get(),
efreet_data_home_get());
system(buf);
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/desktop_order.tar.gz | "
"(cd %s/.e/e/ ; tar -xkf -)",
e_prefix_data_get(),
homedir);
system(buf);
@ -1078,7 +1094,7 @@ _e_main_dirs_init(void)
{
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/efm_favorites.tar.gz | "
"(cd %s/.e/e/ ; tar -xf -)",
"(cd %s/.e/e/ ; tar -xkf -)",
e_prefix_data_get(),
homedir);
system(buf);