7 files changed, 13 insertions, 9 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 2e9bbe123..7f9e4b872 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -358,7 +358,7 @@ bool ClipboardManagerImpl::paste(SPDesktop *desktop, bool in_place)
     if ( desktop == nullptr ) {
         return false;
     }
-    if ( Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false ) {
+    if ( Inkscape::have_viable_layer(desktop, desktop->getMessageStack()) == false ) {
         return false;
     }
 
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 7a79a44e1..e040d3be9 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -363,7 +363,7 @@ Tracer::Kopf2011::Options PixelArtDialogImpl::options()
 
 void PixelArtDialogImpl::vectorize()
 {
-    Inkscape::MessageStack *msgStack = desktop->messageStack();
+    Inkscape::MessageStack *msgStack = desktop->getMessageStack();
 
     if ( !desktop->selection ) {
         char *msg = _("Select an <b>image</b> to trace");
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index d0cbf99cb..b430c17be 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -20,6 +20,7 @@
 #include "xml-tree.h"
 
 #include <glibmm/i18n.h>
+#include <memory>
 
 
 #include "desktop.h"
@@ -94,7 +95,7 @@ XmlTree::XmlTree() :
 
     contents->pack_start(*notebook_content, true, true, 0);
 
-    _message_stack = new Inkscape::MessageStack();
+    _message_stack = std::make_shared<Inkscape::MessageStack>();
     _message_context = new Inkscape::MessageContext(_message_stack);
     _message_changed_connection = _message_stack->connectChanged(
             sigc::bind(sigc::ptr_fun(_set_status_message), GTK_WIDGET(status.gobj())));
@@ -236,7 +237,6 @@ XmlTree::~XmlTree ()
     _message_changed_connection.disconnect();
     delete _message_context;
     _message_context = nullptr;
-    Inkscape::GC::release(_message_stack);
     _message_stack = nullptr;
     _message_changed_connection.~connection();
 }
diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h
index 09f90b0c4..973534ebd 100644
--- a/src/ui/dialog/xml-tree.h
+++ b/src/ui/dialog/xml-tree.h
@@ -13,6 +13,8 @@
 #ifndef SEEN_DIALOGS_XML_TREE_H
 #define SEEN_DIALOGS_XML_TREE_H
 
+#include <memory>
+
 #include "ui/widget/panel.h"
 #include <gtkmm/entry.h>
 #include <gtkmm/textview.h>
@@ -191,7 +193,7 @@ private:
     /**
      * Status bar
      */
-    Inkscape::MessageStack *_message_stack;
+    std::shared_ptr<Inkscape::MessageStack> _message_stack;
     Inkscape::MessageContext *_message_context;
 
     /**
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 491154fb4..3ec0e6916 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -513,7 +513,7 @@ bool TextTool::root_handler(GdkEvent* event) {
         case GDK_BUTTON_PRESS:
             if (event->button.button == 1 && !this->space_panning) {
 
-                if (Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false) {
+                if (Inkscape::have_viable_layer(desktop, desktop->getMessageStack()) == false) {
                     return TRUE;
                 }
 
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index e8c3e32db..e15ea7780 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -12,6 +12,7 @@
  */
 
 #include <2geom/point.h>
+#include <memory>
 #include "document.h"
 #include "view.h"
 #include "message-stack.h"
@@ -57,7 +58,7 @@ _onDocumentResized (double x, double y, View* v)
 View::View()
 :  _doc(nullptr)
 {
-    _message_stack = GC::release(new Inkscape::MessageStack());
+    _message_stack = std::make_shared<Inkscape::MessageStack>();
     _tips_message_context = new Inkscape::MessageContext(_message_stack);
 
     _resized_connection = _resized_signal.connect (sigc::bind (sigc::ptr_fun (&_onResized), this));
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index fa28ec72e..1134e727a 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -14,6 +14,7 @@
 
 #include <gdk/gdk.h>
 #include <cstddef>
+#include <memory>
 #include <sigc++/connection.h>
 #include "message.h"
 #include "inkgc/gc-managed.h"
@@ -85,7 +86,7 @@ public:
     SPDocument *doc() const
       { return _doc; }
     /// Returns a pointer to the view's message stack.
-    Inkscape::MessageStack *messageStack() const
+    std::shared_ptr<Inkscape::MessageStack> messageStack() const
       { return _message_stack; }
     /// Returns a pointer to the view's tipsMessageContext.
     Inkscape::MessageContext *tipsMessageContext() const
@@ -108,7 +109,7 @@ public:
 
 protected:
     SPDocument *_doc;
-    Inkscape::MessageStack *_message_stack;
+    std::shared_ptr<Inkscape::MessageStack> _message_stack;
     Inkscape::MessageContext *_tips_message_context;
 
     virtual void _close();