[glom: 1/2] Fix a crash when specifying a static image on the layout.

[Murray Cumming <murrayc src gnome org>]

commit a738b689ee3d1cf5df130dafbef79caa0b5cdb52
Author: Murray Cumming <murrayc openismus com>
Date:   Fri Nov 6 14:28:04 2009 +0100

    Fix a crash when specifying a static image on the layout.
    
    * glom/utility_widgets/imageglom.cc: on_menupopup_activate_select_file():
    Check for a null parent window pointer to avoid a crash, fixing bug
    #600954 (Michael Hasselmann).

 ChangeLog                          |    8 ++++++++
 glom/mode_data/box_data_details.cc |    2 +-
 glom/utility_widgets/imageglom.cc  |    4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 67abe6f..510efc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-06  Murray Cumming  <murrayc murrayc com>
+
+	Fix a crash when specifying a static image on the layout.
+
+	* glom/utility_widgets/imageglom.cc: on_menupopup_activate_select_file():
+	Check for a null parent window pointer to avoid a crash, fixing bug 
+	#600954 (Michael Hasselmann).
+
 2009-11-04  David King  <davidk openismus com>
 
 	* glom.xml: Add Maemo-specific category for classification of .glom
diff --git a/glom/mode_data/box_data_details.cc b/glom/mode_data/box_data_details.cc
index 38a2141..067e2c3 100644
--- a/glom/mode_data/box_data_details.cc
+++ b/glom/mode_data/box_data_details.cc
@@ -339,7 +339,7 @@ bool Box_Data_Details::fill_from_database()
             if(element->get_name() != layout_item->get_name())
               continue;
             
-            //Compare the relationship and related relationshp:
+            //Compare the relationship and related relationship:
             sharedptr<const UsesRelationship> uses_a = layout_item;
             sharedptr<const UsesRelationship> uses_b = element;
             if(*uses_a == *uses_b)
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 85e057b..12629f6 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -435,7 +435,9 @@ void ImageGlom::on_menupopup_activate_select_file()
         std::auto_ptr<Gtk::Dialog> dialog_keeper(dialog);
 
         App_Glom* pApp = get_application();
-        dialog->set_transient_for(*pApp);
+        if(pApp)
+          dialog->set_transient_for(*pApp);
+
         dialog->load(uri);
 
         if(dialog->run() == Gtk::RESPONSE_ACCEPT)