diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-10-29 10:01:26 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-10-29 10:01:26 +0000 |
| commit | 3630eed967e5b7020d1c1fc1b14fcf9819103d46 (patch) | |
| tree | 2ff0fa96e32bb6aec2c208845c81cb9a19c780a9 /src/file.cpp | |
| parent | merge from trunk (r11826) (diff) | |
| parent | Fix for 165865 : Markers - fix Undo history (diff) | |
| download | inkscape-3630eed967e5b7020d1c1fc1b14fcf9819103d46.tar.gz inkscape-3630eed967e5b7020d1c1fc1b14fcf9819103d46.zip | |
merge from trunk (r11850)
(bzr r11668.1.36)
Diffstat (limited to 'src/file.cpp')
| -rw-r--r-- | src/file.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/file.cpp b/src/file.cpp index a03c459da..14f70fc8c 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -675,7 +675,12 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, } SP_ACTIVE_DESKTOP->event_log->rememberFileSave(); - Glib::ustring msg = Glib::ustring::format(_("Document saved."), " ", doc->getURI()); + Glib::ustring msg; + if (doc->getURI() == NULL) { + msg = Glib::ustring::format(_("Document saved.")); + } else { + msg = Glib::ustring::format(_("Document saved."), " ", doc->getURI()); + } SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::NORMAL_MESSAGE, msg.c_str()); return true; } @@ -952,7 +957,13 @@ sp_file_save_document(Gtk::Window &parentWindow, SPDocument *doc) } } } else { - Glib::ustring msg = Glib::ustring::format(_("No changes need to be saved."), " ", doc->getURI()); + Glib::ustring msg; + if ( doc->getURI() == NULL ) + { + msg = Glib::ustring::format(_("No changes need to be saved.")); + } else { + msg = Glib::ustring::format(_("No changes need to be saved."), " ", doc->getURI()); + } SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg.c_str()); success = TRUE; } |