[glom] Dialog constructors: Don't throw exceptions if GtkBuilder fails.



commit e10fbd790c003a7ddf3b9bdbbbf9f7aa6e706cd4
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 5 11:00:52 2014 +0100

    Dialog constructors: Don't throw exceptions if GtkBuilder fails.
    
    Because 1) We don't do this elsewhere and 2) We would have to
    handle that excetion somehow, but we don't and we can't.
    
    Found by Coverity Scan as an uncaught exception in main().

 glom/import_csv/dialog_import_csv.cc               |    4 +++-
 glom/import_csv/dialog_import_csv_progress.cc      |    4 +++-
 glom/utility_widgets/dialog_image_load_progress.cc |    5 ++++-
 glom/utility_widgets/dialog_image_save_progress.cc |    4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/glom/import_csv/dialog_import_csv.cc b/glom/import_csv/dialog_import_csv.cc
index 961556b..74b602a 100644
--- a/glom/import_csv/dialog_import_csv.cc
+++ b/glom/import_csv/dialog_import_csv.cc
@@ -82,7 +82,9 @@ Dialog_Import_CSV::Dialog_Import_CSV(BaseObjectType* cobject, const Glib::RefPtr
   builder->get_widget("import_csv_error_label", m_error_label);
 
   if(!m_sample_view || !m_encoding_combo || !m_target_table || !m_encoding_info || !m_first_line_as_title || 
!m_sample_rows || !m_error_label)
-    throw std::runtime_error("Missing widgets from glade file for Dialog_Import_CSV");
+  {
+    std::cerr << G_STRFUNC << ": Missing widgets from glade file for Dialog_Import_CSV" << std::endl;
+  }
 
   //Set the adjustment details, to avoid a useless 0-to-0 range and a 0 incremenet.
   //We don't do this the Glade file because GtkBuilder wouldn't find the
diff --git a/glom/import_csv/dialog_import_csv_progress.cc b/glom/import_csv/dialog_import_csv_progress.cc
index 969a5fa..3a7b441 100644
--- a/glom/import_csv/dialog_import_csv_progress.cc
+++ b/glom/import_csv/dialog_import_csv_progress.cc
@@ -45,7 +45,9 @@ Dialog_Import_CSV_Progress::Dialog_Import_CSV_Progress(BaseObjectType* cobject,
   builder->get_widget("import_csv_progress_textview", m_text_view);
 
   if(!m_progress_bar || !m_text_view)
-    throw std::runtime_error("Missing widgets from glade file for Dialog_Import_CSV_Progress");
+  {
+    std::cerr << G_STRFUNC << "Missing widgets from glade file for Dialog_Import_CSV_Progress" << std::endl;
+  }
 }
 
 bool Dialog_Import_CSV_Progress::init_db_details(const Glib::ustring& table_name)
diff --git a/glom/utility_widgets/dialog_image_load_progress.cc 
b/glom/utility_widgets/dialog_image_load_progress.cc
index f679250..e9bb08e 100644
--- a/glom/utility_widgets/dialog_image_load_progress.cc
+++ b/glom/utility_widgets/dialog_image_load_progress.cc
@@ -23,6 +23,7 @@
 #include <gtkmm/messagedialog.h>
 #include <glibmm/main.h>
 #include <glibmm/i18n.h>
+#include <iostream>
 
 namespace
 {
@@ -44,7 +45,9 @@ DialogImageLoadProgress::DialogImageLoadProgress(BaseObjectType* cobject, const
   builder->get_widget("progress_bar", m_progress_bar);
 
   if(!m_progress_bar)
-    throw std::runtime_error("Missing widgets from glade file for DialogImageLoadProgress");
+  {
+    std::cerr << G_STRFUNC << ": Missing widgets from glade file for DialogImageLoadProgress" << std::endl;
+  }
 }
 
 DialogImageLoadProgress::~DialogImageLoadProgress()
diff --git a/glom/utility_widgets/dialog_image_save_progress.cc 
b/glom/utility_widgets/dialog_image_save_progress.cc
index e010acc..ed09f4f 100644
--- a/glom/utility_widgets/dialog_image_save_progress.cc
+++ b/glom/utility_widgets/dialog_image_save_progress.cc
@@ -46,7 +46,9 @@ DialogImageSaveProgress::DialogImageSaveProgress(BaseObjectType* cobject, const
   builder->get_widget("progress_bar", m_progress_bar);
 
   if(!m_progress_bar)
-    throw std::runtime_error("Missing widgets from glade file for DialogImageSaveProgress");
+  {
+    std::cerr << G_STRFUNC << ": Missing widgets from glade file for DialogImageSaveProgress" << std::endl;
+  }
 }
 
 DialogImageSaveProgress::~DialogImageSaveProgress()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]