diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-04 17:42:23 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-04 17:42:23 +0000 |
commit | 1eddf879657d927c9773078bc5c88eefc6b9bc28 (patch) | |
tree | 85799c05ffc273b9b803e2faae88c97e7c58eb0c | |
parent | 733425c62c7b9a23ad465b5b9700612fae3ee356 (diff) |
efl/efreet: use eina_prefix, kill one TODO item.
SVN revision: 82219
-rw-r--r-- | data/Makefile.am | 5 | ||||
-rw-r--r-- | data/efreet/checkme | 2 | ||||
-rw-r--r-- | src/Makefile_Efreet.am | 1 | ||||
-rw-r--r-- | src/bin/efreet/efreetd.c | 3 | ||||
-rw-r--r-- | src/bin/efreet/efreetd_cache.c | 24 |
5 files changed, 30 insertions, 5 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 40efb046d0..890970c73f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am | |||
@@ -23,6 +23,11 @@ ecoreimffilesdir = $(datadir)/ecore_imf | |||
23 | ecoreimffiles_DATA = ecore_imf/checkme | 23 | ecoreimffiles_DATA = ecore_imf/checkme |
24 | 24 | ||
25 | ######################################################################## | 25 | ######################################################################## |
26 | # Efreet | ||
27 | efreetfilesdir = $(datadir)/efreet | ||
28 | efreetfiles_DATA = efreet/checkme | ||
29 | |||
30 | ######################################################################## | ||
26 | # Eo | 31 | # Eo |
27 | eofilesdir = $(datadir)/eo | 32 | eofilesdir = $(datadir)/eo |
28 | eofiles_DATA = eo/eo_step.py | 33 | eofiles_DATA = eo/eo_step.py |
diff --git a/data/efreet/checkme b/data/efreet/checkme new file mode 100644 index 0000000000..82eac5872d --- /dev/null +++ b/data/efreet/checkme | |||
@@ -0,0 +1,2 @@ | |||
1 | This is just a test file used to help efreet determine its prefix | ||
2 | location. | ||
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am index d707150e93..2aff77f94a 100644 --- a/src/Makefile_Efreet.am +++ b/src/Makefile_Efreet.am | |||
@@ -21,6 +21,7 @@ EFREET_COMMON_CPPFLAGS = \ | |||
21 | -I$(top_builddir)/src/lib/edbus \ | 21 | -I$(top_builddir)/src/lib/edbus \ |
22 | -I$(top_srcdir)/src/lib/efreet \ | 22 | -I$(top_srcdir)/src/lib/efreet \ |
23 | -I$(top_builddir)/src/lib/efreet \ | 23 | -I$(top_builddir)/src/lib/efreet \ |
24 | -DPACKAGE_BIN_DIR=\"$(bindir)\" \ | ||
24 | -DPACKAGE_LIB_DIR=\"$(libdir)\" \ | 25 | -DPACKAGE_LIB_DIR=\"$(libdir)\" \ |
25 | -DPACKAGE_DATA_DIR=\"$(datadir)\" \ | 26 | -DPACKAGE_DATA_DIR=\"$(datadir)\" \ |
26 | -DLOCALE_DIR=\"@LOCALE_DIR@\" \ | 27 | -DLOCALE_DIR=\"@LOCALE_DIR@\" \ |
diff --git a/src/bin/efreet/efreetd.c b/src/bin/efreet/efreetd.c index a4ae720a4e..97b516299c 100644 --- a/src/bin/efreet/efreetd.c +++ b/src/bin/efreet/efreetd.c | |||
@@ -18,7 +18,7 @@ quit(void) | |||
18 | } | 18 | } |
19 | 19 | ||
20 | int | 20 | int |
21 | main(void) | 21 | main(int argc, char *argv[]) |
22 | { | 22 | { |
23 | if (!eina_init()) return 1; | 23 | if (!eina_init()) return 1; |
24 | efreetd_log_dom = eina_log_domain_register("efreetd", EFREETD_DEFAULT_LOG_COLOR); | 24 | efreetd_log_dom = eina_log_domain_register("efreetd", EFREETD_DEFAULT_LOG_COLOR); |
@@ -28,6 +28,7 @@ main(void) | |||
28 | goto ecore_error; | 28 | goto ecore_error; |
29 | } | 29 | } |
30 | if (!ecore_init()) goto ecore_error; | 30 | if (!ecore_init()) goto ecore_error; |
31 | ecore_app_args_set(argc, (const char **)argv); | ||
31 | if (!ecore_file_init()) goto ecore_file_error; | 32 | if (!ecore_file_init()) goto ecore_file_error; |
32 | 33 | ||
33 | if (!dbus_init()) goto dbus_error; | 34 | if (!dbus_init()) goto dbus_error; |
diff --git a/src/bin/efreet/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c index 5af928bde0..db392821c3 100644 --- a/src/bin/efreet/efreetd_cache.c +++ b/src/bin/efreet/efreetd_cache.c | |||
@@ -22,6 +22,7 @@ static Ecore_Exe *icon_cache_exe = NULL; | |||
22 | static Ecore_Exe *desktop_cache_exe = NULL; | 22 | static Ecore_Exe *desktop_cache_exe = NULL; |
23 | static Ecore_Timer *icon_cache_timer = NULL; | 23 | static Ecore_Timer *icon_cache_timer = NULL; |
24 | static Ecore_Timer *desktop_cache_timer = NULL; | 24 | static Ecore_Timer *desktop_cache_timer = NULL; |
25 | static Eina_Prefix *pfx = NULL; | ||
25 | 26 | ||
26 | static Eina_Bool desktop_exists = EINA_FALSE; | 27 | static Eina_Bool desktop_exists = EINA_FALSE; |
27 | 28 | ||
@@ -56,8 +57,9 @@ icon_cache_update_cache_cb(void *data EINA_UNUSED) | |||
56 | /* TODO: Queue if already running */ | 57 | /* TODO: Queue if already running */ |
57 | prio = ecore_exe_run_priority_get(); | 58 | prio = ecore_exe_run_priority_get(); |
58 | ecore_exe_run_priority_set(19); | 59 | ecore_exe_run_priority_set(19); |
59 | // XXX: use eina_prefix, not hard-coded prefixes | 60 | |
60 | eina_strlcpy(file, PACKAGE_LIB_DIR "/efreet/efreet_icon_cache_create", sizeof(file)); | 61 | snprintf(file, sizeof(file), "%s/efreet/efreet_icon_cache_create", |
62 | eina_prefix_lib_get(pfx)); | ||
61 | if (icon_extra_dirs) | 63 | if (icon_extra_dirs) |
62 | { | 64 | { |
63 | Eina_List *ll; | 65 | Eina_List *ll; |
@@ -118,8 +120,9 @@ desktop_cache_update_cache_cb(void *data EINA_UNUSED) | |||
118 | desktop_queue = EINA_FALSE; | 120 | desktop_queue = EINA_FALSE; |
119 | prio = ecore_exe_run_priority_get(); | 121 | prio = ecore_exe_run_priority_get(); |
120 | ecore_exe_run_priority_set(19); | 122 | ecore_exe_run_priority_set(19); |
121 | // XXX: use eina_prefix, not hard-coded prefixes | 123 | |
122 | eina_strlcpy(file, PACKAGE_LIB_DIR "/efreet/efreet_desktop_cache_create", sizeof(file)); | 124 | snprintf(file, sizeof(file), "%s/efreet/efreet/efreet_desktop_cache_create", |
125 | eina_prefix_lib_get(pfx)); | ||
123 | if (desktop_extra_dirs) | 126 | if (desktop_extra_dirs) |
124 | { | 127 | { |
125 | Eina_List *ll; | 128 | Eina_List *ll; |
@@ -497,8 +500,18 @@ cache_desktop_exists(void) | |||
497 | Eina_Bool | 500 | Eina_Bool |
498 | cache_init(void) | 501 | cache_init(void) |
499 | { | 502 | { |
503 | char **argv; | ||
500 | char buf[PATH_MAX]; | 504 | char buf[PATH_MAX]; |
501 | 505 | ||
506 | ecore_app_args_get(NULL, &argv); | ||
507 | |||
508 | pfx = eina_prefix_new(argv[0], cache_init, | ||
509 | "EFREET", "efreet", "checkme", | ||
510 | PACKAGE_BIN_DIR, | ||
511 | PACKAGE_LIB_DIR, | ||
512 | PACKAGE_DATA_DIR, | ||
513 | PACKAGE_DATA_DIR); | ||
514 | |||
502 | snprintf(buf, sizeof(buf), "%s/efreet", efreet_cache_home_get()); | 515 | snprintf(buf, sizeof(buf), "%s/efreet", efreet_cache_home_get()); |
503 | if (!ecore_file_mkpath(buf)) | 516 | if (!ecore_file_mkpath(buf)) |
504 | { | 517 | { |
@@ -553,6 +566,9 @@ cache_shutdown(void) | |||
553 | { | 566 | { |
554 | const char *data; | 567 | const char *data; |
555 | 568 | ||
569 | eina_prefix_free(pfx); | ||
570 | pfx = NULL; | ||
571 | |||
556 | efreet_shutdown(); | 572 | efreet_shutdown(); |
557 | 573 | ||
558 | if (cache_exe_del_handler) ecore_event_handler_del(cache_exe_del_handler); | 574 | if (cache_exe_del_handler) ecore_event_handler_del(cache_exe_del_handler); |