liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'gtk3'

Browse Source
This commit is contained in:
Adam Reichold
2016-03-05 09:21:34 +01:00
parent 830c58877f 72283f867d
commit a04c7706db
119 changed files with 3006 additions and 3007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/profilestore.cc
View File

@@ -20,7 +20,6 @@
#include "options.h"
#include "toolpanel.h"
#include "guiutils.h"
#include "../rtengine/safegtk.h"
ProfileStore profileStore;
@@ -168,7 +167,7 @@ bool ProfileStore::parseDir (Glib::ustring& realPath, Glib::ustring& virtualPath
unsigned int folder = 0; // folder's own Id
// reload the available profiles from the profile dir
if (!realPath.empty() && safe_file_test(realPath, Glib::FILE_TEST_EXISTS) && safe_file_test (realPath, Glib::FILE_TEST_IS_DIR)) {
if (!realPath.empty() && Glib::file_test(realPath, Glib::FILE_TEST_EXISTS) && Glib::file_test (realPath, Glib::FILE_TEST_IS_DIR)) {
// add this entry to the folder list
folders.push_back(virtualPath);
@@ -199,7 +198,7 @@ bool ProfileStore::parseDir (Glib::ustring& realPath, Glib::ustring& virtualPath
Glib::ustring fname = Glib::build_filename(realPath, currDir);
if (safe_file_test (fname, Glib::FILE_TEST_IS_DIR)) {
if (Glib::file_test (fname, Glib::FILE_TEST_IS_DIR)) {
Glib::ustring vp(Glib::build_filename(virtualPath, currDir));
Glib::ustring rp(Glib::build_filename(realPath, currDir));
fileFound = parseDir (rp, vp, currDir, folder, level + 1, 0);