mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Replaced deprecated functions

Browse Source
This commit is contained in:
Sanel Zukan 2009-04-16 11:27:28 +00:00
parent d0e0732792
commit 66c119033c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ede-screensaver-conf/XScreenSaver.cpp
View File

@ -30,6 +30,7 @@
#include <X11/Xresource.h> #include <X11/Xresource.h>
#include <edelib/File.h> #include <edelib/File.h>
#include <edelib/FileTest.h>
#include <edelib/Run.h> #include <edelib/Run.h>
#include <edelib/Directory.h> #include <edelib/Directory.h>
#include <edelib/TiXml.h> #include <edelib/TiXml.h>
@ -40,9 +41,10 @@ EDELIB_NS_USING(String)
EDELIB_NS_USING(file_path) EDELIB_NS_USING(file_path)
EDELIB_NS_USING(file_remove) EDELIB_NS_USING(file_remove)
EDELIB_NS_USING(file_rename) EDELIB_NS_USING(file_rename)
EDELIB_NS_USING(file_test)
EDELIB_NS_USING(FILE_TEST_IS_DIR)
EDELIB_NS_USING(run_async) EDELIB_NS_USING(run_async)
EDELIB_NS_USING(dir_home) EDELIB_NS_USING(dir_home)
EDELIB_NS_USING(dir_exists)
EDELIB_NS_USING(dir_empty) EDELIB_NS_USING(dir_empty)
static Atom XA_SCREENSAVER; static Atom XA_SCREENSAVER;
@ -250,7 +252,7 @@ static const char *find_hacks_dir_once(void) {
return xscr_folder_found; return xscr_folder_found;
for(int i = 0; xscr_hacks_dirs[i]; i++) { for(int i = 0; xscr_hacks_dirs[i]; i++) {
if(dir_exists(xscr_hacks_dirs[i])) { if(file_test(xscr_hacks_dirs[i], FILE_TEST_IS_DIR)) {
xscr_folder_found = xscr_hacks_dirs[i]; xscr_folder_found = xscr_hacks_dirs[i];
break; break;
} }
@ -291,7 +293,7 @@ static SaverPrefs *guess_config(void) {
const char* config_dir = NULL, *hacks_dir; const char* config_dir = NULL, *hacks_dir;
for(int i = 0; xscr_hacks_config_dirs[i]; i++) { for(int i = 0; xscr_hacks_config_dirs[i]; i++) {
if(dir_exists(xscr_hacks_config_dirs[i]) && !dir_empty(xscr_hacks_config_dirs[i])) { if(file_test(xscr_hacks_config_dirs[i], FILE_TEST_IS_DIR) && !dir_empty(xscr_hacks_config_dirs[i])) {
config_dir = xscr_hacks_config_dirs[i]; config_dir = xscr_hacks_config_dirs[i];
break; break;
} }