[glom/glom-1-12] Fix a crash in previous commit.

[Murray Cumming <murrayc src gnome org>]

commit d6145872130b648e5c4c4e32286ec7d57b67e702
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 20 12:27:00 2010 +0100

    Fix a crash in previous commit.
    
    * glom/utility_widgets/db_adddel/db_adddel.cc: get_fixed_cell_height():
    Fixed a null-pointer crash when also checking LayoutItem_Text items,
    though the UI doesn't actually allow the font to be specified for them
    yet.

 ChangeLog                                   |   13 +++++++++++--
 NEWS                                        |    2 ++
 glom/utility_widgets/db_adddel/db_adddel.cc |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e52ccfe..337df9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1.12.5 (stable):
+
+2010-01-20  Murray Cumming  <murrayc murrayc com>
+
+	Fix a crash in previous commit.
+
+	* glom/utility_widgets/db_adddel/db_adddel.cc: get_fixed_cell_height():
+	Fixed a null-pointer crash when also checking LayoutItem_Text items, 
+	though the UI doesn't actually allow the font to be specified for them 
+	yet.
+
 2010-01-20  Murray Cumming  <murrayc murrayc com>
 
 	List View: Don't chop off the bottom of text when using large fonts.
@@ -9,8 +20,6 @@
 	will be recalculated for the new columns.
 	Fixes bug #607023 (Michael Hasselmann)
 
-1.12.5 (stable):
-
 2010-01-15  Michael Hasselmann  <michaelh openismus com>
 
 	Add forgotten header to libglom's Makefile
diff --git a/NEWS b/NEWS
index b46b930..101988a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 1.12.5 (stable):
 
+* List View: Don't chop off the bottom of text when using large fonts.
+  (Murray Cumming) Bug #607023 (Michael Hasselmann)
 * Avoid problems when entering numbers with currency suffixes when using the 
   C locale.
   (Murray Cumming, Michael Hasselmann)
diff --git a/glom/utility_widgets/db_adddel/db_adddel.cc b/glom/utility_widgets/db_adddel/db_adddel.cc
index a48786f..25d14ba 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@ -680,7 +680,7 @@ int DbAddDel::get_fixed_cell_height()
         sharedptr<LayoutItem_Text> item_text = sharedptr<LayoutItem_Text>::cast_dynamic(iter->m_item);
         if(item_text)
         {
-          const FieldFormatting& formatting = item_field->get_formatting_used();
+          const FieldFormatting& formatting = item_text->get_formatting_used();
           font_name = formatting.get_text_format_font();
         }
       }