From 81f5e72b8209318d1513e271268d82285582716c Mon Sep 17 00:00:00 2001
From: torger <torger@ludd.ltu.se>
Date: Fri, 21 Mar 2014 13:20:34 +0100
Subject: [PATCH] Catch a more general form of exception, as we don't make use
 of the more specific. Had issues with Runtime type information on OSX, not
 sure exactly what the problem is but this generalization of exception
 handling seem to make it work safely.

---
 rtgui/cachemanager.cc | 2 +-
 rtgui/flatfield.cc    | 4 ++--
 rtgui/preferences.cc  | 2 +-
 rtgui/profilepanel.cc | 8 ++++----
 rtgui/saveasdlg.cc    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rtgui/cachemanager.cc b/rtgui/cachemanager.cc
index 8f335da1e..6112585ec 100644
--- a/rtgui/cachemanager.cc
+++ b/rtgui/cachemanager.cc
@@ -281,7 +281,7 @@ void CacheManager::deleteDir (const Glib::ustring& dirName) {
             safe_g_remove (Glib::build_filename (Glib::build_filename (baseDir, dirName), *i));
         delete dir;
     }
-    catch (const Glib::FileError& fe) {
+    catch (const Glib::Error& e) {
     }
 }
 
diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc
index 6e63c9909..7de12711e 100755
--- a/rtgui/flatfield.cc
+++ b/rtgui/flatfield.cc
@@ -248,12 +248,12 @@ void FlatField::setShortcutPath(Glib::ustring path)
 			try {
 				flatFieldFile->remove_shortcut_folder(lastShortcutPath);
 			}
-			catch (Gtk::FileChooserError &err) {}
+			catch (Glib::Error &err) {}
 		}
 		lastShortcutPath = path;
 		try {
 			flatFieldFile->add_shortcut_folder(path);
 		}
-		catch (Gtk::FileChooserError &err) {}
+		catch (Glib::Error &err) {}
 	}
 }
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 9214d8127..6441b472b 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -1076,7 +1076,7 @@ void Preferences::parseDir (Glib::ustring dirname, std::vector<Glib::ustring>& i
     try {
         dir = new Glib::Dir (dirname);
     }
-    catch (const Glib::FileError& fe) {
+    catch (const Glib::Error& e) {
         return;
     }
     for (Glib::DirIterator i = dir->begin(); i!=dir->end(); ++i) {
diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc
index f6881bf45..1f433f174 100644
--- a/rtgui/profilepanel.cc
+++ b/rtgui/profilepanel.cc
@@ -224,7 +224,7 @@ void ProfilePanel::save_clicked (GdkEventButton* event) {
     try {
         dialog.add_shortcut_folder(options.getPreferredProfilePath());
     }
-    catch (Gtk::FileChooserError &err) {}
+    catch (Glib::Error &err) {}
     //Add the image's path to the Shortcut list
 #ifdef WIN32
     // Dirty workaround, waiting for a clean solution by using exceptions!
@@ -233,7 +233,7 @@ void ProfilePanel::save_clicked (GdkEventButton* event) {
     try {
         dialog.add_shortcut_folder(imagePath);
     }
-    catch (Gtk::FileChooserError &err) {}
+    catch (Glib::Error &err) {}
 
     //Add response buttons the the dialog:
     dialog.add_button(Gtk::StockID("gtk-cancel"), Gtk::RESPONSE_CANCEL);
@@ -380,7 +380,7 @@ void ProfilePanel::load_clicked (GdkEventButton* event) {
     try {
         dialog.add_shortcut_folder(options.getPreferredProfilePath());
     }
-    catch (Gtk::FileChooserError &err) {}
+    catch (Glib::Error &err) {}
 
     //Add the image's path to the Shortcut list
 #ifdef WIN32
@@ -390,7 +390,7 @@ void ProfilePanel::load_clicked (GdkEventButton* event) {
     try {
         dialog.add_shortcut_folder(imagePath);
     }
-    catch (Gtk::FileChooserError &err) {}
+    catch (Glib::Error &err) {}
 
     //Add response buttons the the dialog:
     dialog.add_button(Gtk::StockID("gtk-cancel"), Gtk::RESPONSE_CANCEL);
diff --git a/rtgui/saveasdlg.cc b/rtgui/saveasdlg.cc
index e056fad10..c387f64f9 100644
--- a/rtgui/saveasdlg.cc
+++ b/rtgui/saveasdlg.cc
@@ -270,7 +270,7 @@ void SaveAsDialog::setImagePath (Glib::ustring ipath) {
     try {
         fchooser->add_shortcut_folder(path);
     }
-    catch (Gtk::FileChooserError &err) {}
+    catch (Glib::Error &err) {}
 }