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

Merge from default branch

Browse Source
This commit is contained in:
ffsup2
2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/main.cc
View File

@@ -35,6 +35,8 @@
#ifndef WIN32
#include <config.h>
#include <glibmm/fileutils.h>
#include <glib.h>
#include <glib/gstdio.h>
#endif
#include <safegtk.h>
@@ -84,8 +86,8 @@ int main(int argc, char **argv)
else
argv1_ = "";
argv0 = safe_locale_to_utf8 (argv0_);
argv1 = safe_locale_to_utf8 (argv1_);
argv0 = Glib::filename_to_utf8 (argv0_);
argv1 = Glib::filename_to_utf8 (argv1_);
Glib::thread_init();
gdk_threads_init();
@@ -93,6 +95,12 @@ int main(int argc, char **argv)
Options::load ();
#ifndef _WIN32
// Move the old path to the new one if the new does not exist
if (Glib::file_test(Glib::build_filename(options.rtdir,"cache"), Glib::FILE_TEST_IS_DIR) && !Glib::file_test(options.cacheBaseDir, Glib::FILE_TEST_IS_DIR))
::g_rename(Glib::build_filename(options.rtdir,"cache").c_str(), options.cacheBaseDir.c_str());
#endif
// Gtk::RC::add_default_file (argv0+"/themes/"+options.theme);
std::vector<std::string> rcfiles;
rcfiles.push_back (argv0+"/themes/"+options.theme);