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

Finally fully remove the safegtk module.

Browse Source
This commit is contained in:
Adam Reichold
2015-12-26 16:22:06 +01:00
parent 1297f4b2ec
commit a2eea7c265
51 changed files with 132 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/filepanel.cc
View File

@@ -18,8 +18,6 @@
*/
#include "filepanel.h"
#include "../rtengine/safegtk.h"
#include "rtwindow.h"
#include "inspector.h"
#include "placesbrowser.h"
@@ -179,7 +177,7 @@ void FilePanel::init ()
dirBrowser->fillDirTree ();
placesBrowser->refreshPlacesList ();
if (argv1 != "" && safe_file_test (argv1, Glib::FILE_TEST_IS_DIR)) {
if (argv1 != "" && Glib::file_test (argv1, Glib::FILE_TEST_IS_DIR)) {
dirBrowser->open (argv1);
} else {
if (options.startupDir == STARTUPDIR_HOME) {
@@ -187,7 +185,7 @@ void FilePanel::init ()
} else if (options.startupDir == STARTUPDIR_CURRENT) {
dirBrowser->open (argv0);
} else if (options.startupDir == STARTUPDIR_CUSTOM || options.startupDir == STARTUPDIR_LAST) {
if (options.startupPath.length() && safe_file_test(options.startupPath, Glib::FILE_TEST_EXISTS) && safe_file_test(options.startupPath, Glib::FILE_TEST_IS_DIR)) {
if (options.startupPath.length() && Glib::file_test(options.startupPath, Glib::FILE_TEST_EXISTS) && Glib::file_test(options.startupPath, Glib::FILE_TEST_IS_DIR)) {
dirBrowser->open (options.startupPath);
} else {
// Fallback option if the path is empty or the folder doesn't exist
@@ -324,9 +322,9 @@ void FilePanel::saveOptions ()
void FilePanel::open (const Glib::ustring& d)
{
if (safe_file_test (d, Glib::FILE_TEST_IS_DIR)) {
if (Glib::file_test (d, Glib::FILE_TEST_IS_DIR)) {
dirBrowser->open (d.c_str());
} else if (safe_file_test (d, Glib::FILE_TEST_EXISTS)) {
} else if (Glib::file_test (d, Glib::FILE_TEST_EXISTS)) {
dirBrowser->open (Glib::path_get_dirname(d), Glib::path_get_basename(d));
}
}