[glom/maemo5: 5/5] Fix merge conflicts from master.

[Murray Cumming <murrayc src gnome org>]

commit daecb80cd0b742e6df5acf913ab6ef810cd5b6ab
Merge: 2811aec... ac0a090...
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Oct 16 11:40:47 2009 +0200

    Fix merge conflicts from master.

 ChangeLog                         |    5 +++++
 glom/libglom/document/document.cc |    6 +++++-
 glom/mode_data/box_data_portal.cc |    2 ++
 glom/mode_data/notebook_data.cc   |    2 ++
 4 files changed, 14 insertions(+), 1 deletions(-)
---
diff --cc glom/libglom/document/document.cc
index a52fe84,864c72e..af1aa0e
--- a/glom/libglom/document/document.cc
+++ b/glom/libglom/document/document.cc
@@@ -2324,6 -2324,9 +2324,10 @@@ void Document::load_after_translations(
    if(has_title_singular)
    {
      const xmlpp::Element* nodeTitleSingular = get_node_child_named(element, GLOM_NODE_TABLE_TITLE_SINGULAR);
++
+     if(!has_title_singular->m_title_singular)
+      has_title_singular->m_title_singular = sharedptr<TranslatableItem>::create();
+ 
      load_after_translations(nodeTitleSingular, *(has_title_singular->m_title_singular));
    }
  }