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:24:52 +00:00
parent cfe8b8adb7
commit d0e0732792
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ede-desktop/ede-desktop.cpp
View File

@ -27,9 +27,9 @@
#include <FL/Fl_Menu_Button.H>
#include <edelib/Debug.h>
#include <edelib/File.h>
#include <edelib/DesktopFile.h>
#include <edelib/FileTest.h>
#include <edelib/Directory.h>
#include <edelib/DesktopFile.h>
#include <edelib/DirWatch.h>
#include <edelib/MimeType.h>
#include <edelib/StrUtil.h>
@ -212,7 +212,7 @@ void Desktop::init_internals(void) {
/* setup watcher used for Desktop and Trash directories */
edelib::DirWatch::init();
if(edelib::dir_exists(desktop_path.c_str())) {
if(edelib::file_test(desktop_path.c_str(), edelib::FILE_TEST_IS_DIR)) {
load_icons(desktop_path.c_str());
if(!edelib::DirWatch::add(desktop_path.c_str(),
@ -229,7 +229,7 @@ void Desktop::init_internals(void) {
p = edelib::user_data_dir();
trash_path = edelib::build_filename(p.c_str(), "Trash/files");
if(edelib::dir_exists(trash_path.c_str())) {
if(edelib::file_test(trash_path.c_str(), edelib::FILE_TEST_IS_DIR)) {
if(!edelib::DirWatch::add(trash_path.c_str(), edelib::DW_CREATE | edelib::DW_DELETE))
E_WARNING(E_STRLOC ": Unable to watch %s\n", trash_path.c_str());
}
@ -379,11 +379,6 @@ void Desktop::save_icons_positions(void) {
bool Desktop::read_desktop_file(const char* path, IconSettings& is) {
E_ASSERT(path != NULL);
if(!edelib::file_exists(path)) {
E_DEBUG(E_STRLOC ": %s don't exists\n");
return false;
}
edelib::DesktopFile dconf;
if(!dconf.load(path)) {
E_WARNING(E_STRLOC ": Can't read %s (%s)\n", path, dconf.strerror());
@ -784,7 +779,7 @@ void Desktop::dnd_drop_source(const char* src, int src_len, int x, int y) {
else
sptr = src_copy;
if(!edelib::file_exists(sptr) && !edelib::dir_exists(sptr)) {
if(!edelib::file_test(sptr, edelib::FILE_TEST_IS_REGULAR) || !edelib::file_test(sptr, edelib::FILE_TEST_IS_DIR)) {
edelib::message("Droping file content is not implemented yet. Soon, soon... :)");
delete [] src_copy;
return;