Use document rather than namedview in creating desktop widget.

3 files changed, 9 insertions, 6 deletions

diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp
index 9c6fbcb84..ff797f072 100644
--- a/src/inkscape-window.cpp
+++ b/src/inkscape-window.cpp
@@ -61,7 +61,7 @@ InkscapeWindow::InkscapeWindow(SPDocument* document)
     // Menu bar
 
     // Desktop widget (=> MultiPaned)
-    _desktop_widget = sp_desktop_widget_new(sp_document_namedview(document, nullptr));
+    _desktop_widget = sp_desktop_widget_new(_document);
     gtk_container_add(GTK_CONTAINER(_mainbox->gobj()), GTK_WIDGET(_desktop_widget));
     gtk_widget_show(GTK_WIDGET(_desktop_widget));
     _desktop = _desktop_widget->desktop;
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 6c588dc59..84f837caa 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1636,16 +1636,18 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp
 }
 
 
-SPDesktopWidget *sp_desktop_widget_new( SPNamedView *namedview )
+SPDesktopWidget *sp_desktop_widget_new(SPDocument *document)
 {
-    SPDesktopWidget* dtw = SPDesktopWidget::createInstance(namedview);
+    SPDesktopWidget* dtw = SPDesktopWidget::createInstance(document);
     return dtw;
 }
 
-SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
+SPDesktopWidget* SPDesktopWidget::createInstance(SPDocument *document)
 {
     SPDesktopWidget *dtw = static_cast<SPDesktopWidget*>(g_object_new(SP_TYPE_DESKTOP_WIDGET, nullptr));
 
+    SPNamedView *namedview = sp_document_namedview(document, nullptr);
+
     dtw->_dt2r = 1. / namedview->display_units->factor;
 
     dtw->_ruler_origin = Geom::Point(0,0); //namedview->gridorigin;   Why was the grid origin used here?
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 44d8fa349..e6702ce41 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -28,6 +28,7 @@
 typedef struct _EgeColorProfTracker EgeColorProfTracker;
 struct SPCanvas;
 struct SPCanvasItem;
+class SPDocument;
 class SPDesktop;
 struct SPDesktopWidget;
 class SPObject;
@@ -65,7 +66,7 @@ class SelectedStyle;
 /**
  * Create a new SPDesktopWidget
  */
-SPDesktopWidget *sp_desktop_widget_new(SPNamedView *namedview);
+SPDesktopWidget *sp_desktop_widget_new(SPDocument* document);
 
 void sp_desktop_widget_show_decorations(SPDesktopWidget *dtw, gboolean show);
 void sp_desktop_widget_update_hruler (SPDesktopWidget *dtw);
@@ -276,7 +277,7 @@ public:
     Inkscape::UI::Widget::Dock* getDock();
 
     static GType getType();
-    static SPDesktopWidget* createInstance(SPNamedView *namedview);
+    static SPDesktopWidget* createInstance(SPDocument *document);
 
     void updateNamedview();
     void update_guides_lock();