From c35fe9c8d780e447dd6e3a8263689ea661a630de Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Tue, 22 Jan 2013 19:46:36 +0100 Subject: direct use of Glib::ustring (bzr r12053) --- src/document.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/document.cpp') diff --git a/src/document.cpp b/src/document.cpp index 172037518..25ad735e1 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -862,7 +862,7 @@ SPDocument::removeUndoObserver(Inkscape::UndoStackObserver& observer) SPObject *SPDocument::getObjectById(Glib::ustring const &id) const { - return getObjectById( id.c_str() ); + return getObjectById( id ); } SPObject *SPDocument::getObjectById(gchar const *id) const -- cgit v1.2.3 From 70467baaabf4efc3f76297058a358c04212419c2 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Wed, 23 Jan 2013 22:21:28 +0100 Subject: revert my revision 12053 (Bug #1103248 ) (bzr r12058) --- src/document.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/document.cpp') diff --git a/src/document.cpp b/src/document.cpp index 25ad735e1..172037518 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -862,7 +862,7 @@ SPDocument::removeUndoObserver(Inkscape::UndoStackObserver& observer) SPObject *SPDocument::getObjectById(Glib::ustring const &id) const { - return getObjectById( id ); + return getObjectById( id.c_str() ); } SPObject *SPDocument::getObjectById(gchar const *id) const -- cgit v1.2.3 From 32ff8baed32f34bf6083d05fa27b8bb1b2d0d596 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Tue, 29 Jan 2013 18:12:40 +0100 Subject: Crash. Partial fix for Bug #1046068 (Inkscape (GTK+/Quartz) calls output extensions or crashes when quitting while clipboard not empty). (bzr r12071) --- src/document.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/document.cpp') diff --git a/src/document.cpp b/src/document.cpp index 172037518..97b3bf584 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -1435,10 +1435,12 @@ bool SPDocument::isSeeking() const { void SPDocument::setModifiedSinceSave(bool modified) { this->modified_since_save = modified; - Gtk::Window *parent = SP_ACTIVE_DESKTOP->getToplevel(); - g_assert(parent != NULL); - SPDesktopWidget *dtw = static_cast(parent->get_data("desktopwidget")); - dtw->updateTitle( this->getName() ); + if (SP_ACTIVE_DESKTOP) { + Gtk::Window *parent = SP_ACTIVE_DESKTOP->getToplevel(); + g_assert(parent != NULL); + SPDesktopWidget *dtw = static_cast(parent->get_data("desktopwidget")); + dtw->updateTitle( this->getName() ); + } } -- cgit v1.2.3