glom r1984 - in trunk: . glom/libglom/data_structure glom/navigation

[murrayc svn gnome org]

Author: murrayc
Date: Fri Mar 13 14:17:54 2009
New Revision: 1984
URL: http://svn.gnome.org/viewvc/glom?rev=1984&view=rev

Log:
2009-03-13  Murray Cumming  <murrayc murrayc com>

* glom/libglom/data_structure/fieldtypes.cc: Avoid an extra 
update_meta_store() when exceptions are disabled.
* glom/navigation/box_tables.cc: fill_table_row(): Avoid a crash when 
the TableInfo is null.

Modified:
   trunk/ChangeLog
   trunk/glom/libglom/data_structure/fieldtypes.cc
   trunk/glom/navigation/box_tables.cc

Modified: trunk/glom/libglom/data_structure/fieldtypes.cc
==============================================================================
--- trunk/glom/libglom/data_structure/fieldtypes.cc	(original)
+++ trunk/glom/libglom/data_structure/fieldtypes.cc	Fri Mar 13 14:17:54 2009
@@ -49,7 +49,7 @@
       data_model_tables = gda_connection->get_meta_store_data(Gnome::Gda::CONNECTION_META_TYPES);
 #else
     std::auto_ptr<Glib::Error> error;
-    if(gda_connection->update_meta_store(error))
+    if(true) //Already done in ConnectionPool::connect(): gda_connection->update_meta_store(error))
       data_model_tables = gda_connection->get_meta_store_data(Gnome::Gda::CONNECTION_META_TYPES, error);
 
     // Ignore error here, we do not process data_model_tables if it is NULL

Modified: trunk/glom/navigation/box_tables.cc
==============================================================================
--- trunk/glom/navigation/box_tables.cc	(original)
+++ trunk/glom/navigation/box_tables.cc	Fri Mar 13 14:17:54 2009
@@ -65,6 +65,12 @@
 
 void Box_Tables::fill_table_row(const Gtk::TreeModel::iterator& iter, const sharedptr<const TableInfo>& table_info)
 {
+  if(!table_info)
+  {
+    std::cerr << "Box_Tables::fill_table_row(): table_info was null." << std::endl;
+    return;
+  }
+  
   if(iter)
   {
     const bool developer_mode = (get_userlevel() == AppState::USERLEVEL_DEVELOPER);