diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-05-11 09:35:03 +0000 |
|---|---|---|
| committer | John Smith <removethis.john.q.public@bigmail.com> | 2012-05-11 09:35:03 +0000 |
| commit | 8e03be1b452837fd438b811fbdcfe9ac65765bc4 (patch) | |
| tree | cbfcbf8fd6906a9edf47fe8c5d48833472cf3cd4 /src/ui/widget | |
| parent | GTK+3 drawing of icons (diff) | |
| download | inkscape-8e03be1b452837fd438b811fbdcfe9ac65765bc4.tar.gz inkscape-8e03be1b452837fd438b811fbdcfe9ac65765bc4.zip | |
Fix for 997886 : Document Metadata : Crash when saving with 2 documents open
(bzr r11353)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/entity-entry.cpp | 8 | ||||
| -rw-r--r-- | src/ui/widget/licensor.cpp | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp index be43e4fda..2a6e2bcd0 100644 --- a/src/ui/widget/entity-entry.cpp +++ b/src/ui/widget/entity-entry.cpp @@ -26,6 +26,7 @@ #include "ui/widget/registry.h" #include "sp-root.h" #include "document-undo.h" +#include "document-private.h" #include "verbs.h" #include "entity-entry.h" @@ -105,8 +106,9 @@ EntityLineEntry::on_changed() SPDocument *doc = SP_ACTIVE_DOCUMENT; Glib::ustring text = static_cast<Gtk::Entry*>(_packable)->get_text(); if (rdf_set_work_entity (doc, _entity, text.c_str())) { - DocumentUndo::done(doc, SP_VERB_NONE, - /* TODO: annotate */ "entity-entry.cpp:101"); + if (doc->priv->sensitive) { + DocumentUndo::done(doc, SP_VERB_NONE, "Document metadata updated"); + } } _wr->setUpdating (false); } @@ -155,7 +157,7 @@ EntityMultiLineEntry::on_changed() Gtk::TextView *tv = static_cast<Gtk::TextView*>(s->get_child()); Glib::ustring text = tv->get_buffer()->get_text(); if (rdf_set_work_entity (doc, _entity, text.c_str())) { - DocumentUndo::done(doc, SP_VERB_NONE, + DocumentUndo::done(doc, SP_VERB_NONE, /* TODO: annotate */ "entity-entry.cpp:146"); } _wr->setUpdating (false); diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp index d31d4b759..98a5808d6 100644 --- a/src/ui/widget/licensor.cpp +++ b/src/ui/widget/licensor.cpp @@ -25,6 +25,7 @@ #include "rdf.h" #include "inkscape.h" #include "document-undo.h" +#include "document-private.h" #include "verbs.h" #include <gtkmm/radiobutton.h> @@ -66,9 +67,11 @@ void LicenseItem::on_toggled() if (_wr.isUpdating()) return; _wr.setUpdating (true); - rdf_set_license (SP_ACTIVE_DOCUMENT, _lic->details ? _lic : 0); - DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_NONE, - /* TODO: annotate */ "licensor.cpp:65"); + SPDocument *doc = SP_ACTIVE_DOCUMENT; + rdf_set_license (doc, _lic->details ? _lic : 0); + if (doc->priv->sensitive) { + DocumentUndo::done(doc, SP_VERB_NONE, "Document license updated"); + } _wr.setUpdating (false); static_cast<Gtk::Entry*>(_eep->_packable)->set_text (_lic->uri); _eep->on_changed(); |