Fix for 1068763 : Opening 'File > Document Properties' dirties current document

(bzr r11855)

3 files changed, 15 insertions, 9 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 7bd1b81c0..4a6429fc5 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -150,6 +150,7 @@ DocumentProperties::DocumentProperties()
     _notebook.append_page(_page_metadata1, _("Metadata"));
     _notebook.append_page(_page_metadata2, _("License"));
 
+    _wr.setUpdating (true);
     build_page();
     build_guides();
     build_gridspage();
@@ -159,6 +160,7 @@ DocumentProperties::DocumentProperties()
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     build_scripting();
     build_metadata();
+    _wr.setUpdating (false);
 
     _grids_button_new.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onNewGrid));
     _grids_button_remove.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onRemoveGrid));
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 7fff7d87f..8ecd36af2 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -44,7 +44,7 @@ const struct rdf_license_t _other_license =
 
 class LicenseItem : public Gtk::RadioButton {
 public:
-    LicenseItem (struct rdf_license_t const* license, EntityEntry* entity, Registry &wr);
+    LicenseItem (struct rdf_license_t const* license, EntityEntry* entity, Registry &wr, Gtk::RadioButtonGroup *group);
 protected:
     void on_toggled();
     struct rdf_license_t const *_lic;
@@ -52,13 +52,12 @@ protected:
     Registry                   &_wr;
 };
 
-LicenseItem::LicenseItem (struct rdf_license_t const* license, EntityEntry* entity, Registry &wr)
+LicenseItem::LicenseItem (struct rdf_license_t const* license, EntityEntry* entity, Registry &wr, Gtk::RadioButtonGroup *group)
 : Gtk::RadioButton(_(license->name)), _lic(license), _eep(entity), _wr(wr)
 {
-    static Gtk::RadioButtonGroup group = get_group();
-    static bool first = true;
-    if (first) first = false;
-    else       set_group (group);
+    if (group) {
+        set_group (*group);
+    }
 }
 
 /// \pre it is assumed that the license URI entry is a Gtk::Entry
@@ -97,18 +96,19 @@ void Licensor::init (Registry& wr)
 
     LicenseItem *i;
     wr.setUpdating (true);
-    i = manage (new LicenseItem (&_proprietary_license, _eentry, wr));
+    i = manage (new LicenseItem (&_proprietary_license, _eentry, wr, NULL));
+    Gtk::RadioButtonGroup group = i->get_group();
     add (*i);
     LicenseItem *pd = i;
 
     for (struct rdf_license_t * license = rdf_licenses;
              license && license->name;
              license++) {
-        i = manage (new LicenseItem (license, _eentry, wr));
+        i = manage (new LicenseItem (license, _eentry, wr, &group));
         add(*i);
     }
     // add Other at the end before the URI field for the confused ppl.
-    LicenseItem *io = manage (new LicenseItem (&_other_license, _eentry, wr));
+    LicenseItem *io = manage (new LicenseItem (&_other_license, _eentry, wr, &group));
     add (*io);
 
     pd->set_active();
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 90eb6a3fd..2ab72d6c7 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -245,12 +245,14 @@ PageSizer::PageSizer(Registry & _wr)
       _widgetRegistry(&_wr)
 {
     // set precision of scalar entry boxes
+    _wr.setUpdating (true);
     _dimensionWidth.setDigits(5);
     _dimensionHeight.setDigits(5);
     _marginTop.setDigits(5);
     _marginLeft.setDigits(5);
     _marginRight.setDigits(5);
     _marginBottom.setDigits(5);
+    _wr.setUpdating (false);
 
     //# Set up the Paper Size combo box
     _paperSizeListStore = Gtk::ListStore::create(_paperSizeListColumns);
@@ -315,11 +317,13 @@ PageSizer::PageSizer(Registry & _wr)
     // Setting default custom unit to document unit
     SPDesktop *dt = SP_ACTIVE_DESKTOP;
     SPNamedView *nv = sp_desktop_namedview(dt);
+    _wr.setUpdating (true);
     if (nv->units) {
         _dimensionUnits.setUnit(nv->units);
     } else if (nv->doc_units) {
         _dimensionUnits.setUnit(nv->doc_units);
     }
+    _wr.setUpdating (false);
     
     //## Set up custom size frame
     _customFrame.set_label(_("Custom size"));