glom r1674 - in trunk: . glom

[murrayc svn gnome org]

Author: murrayc
Date: Wed Aug 27 14:38:13 2008
New Revision: 1674
URL: http://svn.gnome.org/viewvc/glom?rev=1674&view=rev

Log:
2008-08-27  Murray Cumming  <murrayc murrayc com>

* glom/base_db.cc offer_field_list(), offer_field_formatting(),
offer_imageobject(), offer_notebook(): Return the initial item if the user 
cancelled the dialog.


Modified:
   trunk/ChangeLog
   trunk/glom/base_db.cc

Modified: trunk/glom/base_db.cc
==============================================================================
--- trunk/glom/base_db.cc	(original)
+++ trunk/glom/base_db.cc	Wed Aug 27 14:38:13 2008
@@ -1329,6 +1329,8 @@
       //Get the chosen field:
       result = dialog->get_field_chosen();
     }
+    else if(start_field) //Cancel means use the old one:
+      result = glom_sharedptr_clone(start_field);
 
     delete dialog;
   }
@@ -1364,6 +1366,8 @@
         //Get the chosen field:
         result = dialog->get_field_chosen();
       }
+      else if(start_field) //Cancel means use the old one:
+        result = glom_sharedptr_clone(start_field);
 
       remove_view(dialog);
       delete dialog;
@@ -1414,7 +1418,7 @@
 
 sharedptr<LayoutItem_Image> Base_DB::offer_imageobject(const sharedptr<LayoutItem_Image>& start_imageobject, Gtk::Window* transient_for, bool show_title)
 {
-  sharedptr<LayoutItem_Image> result;
+  sharedptr<LayoutItem_Image> result = start_imageobject;
 
   try
   {
@@ -1449,7 +1453,7 @@
 
 sharedptr<LayoutItem_Notebook> Base_DB::offer_notebook(const sharedptr<LayoutItem_Notebook>& start_notebook, Gtk::Window* transient_for)
 {
-  sharedptr<LayoutItem_Notebook> result;
+  sharedptr<LayoutItem_Notebook> result = start_notebook;
 
   try
   {