From a5c612d4855004f0aefaca1e5042e5246654f178 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 26 Mar 2007 16:31:10 +0000 Subject: [PATCH] - better error output SVN revision: 29173 --- legacy/efreet/src/bin/ef_data_dirs.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/legacy/efreet/src/bin/ef_data_dirs.c b/legacy/efreet/src/bin/ef_data_dirs.c index c24dce75db..173a591956 100644 --- a/legacy/efreet/src/bin/ef_data_dirs.c +++ b/legacy/efreet/src/bin/ef_data_dirs.c @@ -11,11 +11,14 @@ ef_cb_efreet_data_home(void) putenv("XDG_DATA_HOME=/var/tmp"); + efreet_shutdown(); + efreet_init(); + tmp = efreet_data_home_get(); if (strcmp(tmp, "/var/tmp")) { printf("efreet_data_home_get() returned incorrect " - "value on XDG_DATA_HOME=/var/tmp\n"); + "value (%s) on XDG_DATA_HOME=/var/tmp\n", tmp); ret = 0; } @@ -30,7 +33,7 @@ ef_cb_efreet_data_home(void) if (strcmp(tmp, "/home/tmp/.local/share")) { printf("efreet_data_home_get() returned incorrect " - "value on blank XDG_DATA_HOME\n"); + "value (%s) on blank XDG_DATA_HOME\n", tmp); ret = 0; } @@ -60,11 +63,14 @@ ef_cb_efreet_config_home(void) putenv("XDG_CONFIG_HOME=/var/tmp"); + efreet_shutdown(); + efreet_init(); + tmp = efreet_config_home_get(); if (strcmp(tmp, "/var/tmp")) { printf("efreet_config_home_get() returned incorrect " - "value on XDG_CONFIG_HOME=/var/tmp\n"); + "value (%s) on XDG_CONFIG_HOME=/var/tmp\n", tmp); ret = 0; } @@ -79,7 +85,7 @@ ef_cb_efreet_config_home(void) if (strcmp(tmp, "/home/tmp/.config")) { printf("efreet_config_home_get() returned incorrect " - "value on blank XDG_CONFIG_HOME\n"); + "value (%s) on blank XDG_CONFIG_HOME\n", tmp); ret = 0; } @@ -109,11 +115,14 @@ ef_cb_efreet_cache_home(void) putenv("XDG_CACHE_HOME=/var/tmp"); + efreet_shutdown(); + efreet_init(); + tmp = efreet_cache_home_get(); if (strcmp(tmp, "/var/tmp")) { printf("efreet_cache_home_get() returned incorrect " - "value on XDG_CACHE_HOME=/var/tmp\n"); + "value (%s) on XDG_CACHE_HOME=/var/tmp\n", tmp); ret = 0; } @@ -128,7 +137,7 @@ ef_cb_efreet_cache_home(void) if (strcmp(tmp, "/home/tmp/.cache")) { printf("efreet_cache_home_get() returned incorrect " - "value on blank XDG_CACHE_HOME\n"); + "value (%s) on blank XDG_CACHE_HOME\n", tmp); ret = 0; } @@ -169,6 +178,9 @@ ef_cb_efreet_data_dirs(void) putenv(dirs); + efreet_shutdown(); + efreet_init(); + i = 0; tmp = efreet_data_dirs_get(); ecore_list_goto_first(tmp); @@ -242,6 +254,9 @@ ef_cb_efreet_config_dirs(void) putenv(dirs); + efreet_shutdown(); + efreet_init(); + i = 0; tmp = efreet_config_dirs_get(); ecore_list_goto_first(tmp);