No longer use widget data to store pointer to window.

2 files changed, 1 insertions, 19 deletions

diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp
index 2651498b9..ed9e03329 100644
--- a/src/inkscape-window.cpp
+++ b/src/inkscape-window.cpp
@@ -62,6 +62,7 @@ InkscapeWindow::InkscapeWindow(SPDocument* document)
 
     // Desktop widget (=> MultiPaned)
     _desktop_widget = sp_desktop_widget_new(_document);
+    _desktop_widget->window = this;
     gtk_container_add(GTK_CONTAINER(_mainbox->gobj()), GTK_WIDGET(_desktop_widget));
     gtk_widget_show(GTK_WIDGET(_desktop_widget));
     _desktop = _desktop_widget->desktop;
@@ -78,9 +79,6 @@ InkscapeWindow::InkscapeWindow(SPDocument* document)
 
     // ============ Stuff to be cleaned up ===========
 
-    g_object_set_data(G_OBJECT(_desktop_widget), "window", this);
-    _desktop_widget->window = this;
-
     signal_delete_event().connect(      sigc::mem_fun(*_desktop, &SPDesktop::onDeleteUI));
     signal_window_state_event().connect(sigc::mem_fun(*_desktop, &SPDesktop::onWindowStateEvent));
     signal_focus_in_event().connect(sigc::mem_fun(*_desktop_widget, &SPDesktopWidget::onFocusInEvent));
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 84f837caa..351b437d6 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -776,8 +776,6 @@ SPDesktopWidget::dispose(GObject *object)
 void
 SPDesktopWidget::updateTitle(gchar const* uri)
 {
-    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
-
     if (window) {
 
         SPDocument *doc = this->desktop->doc();
@@ -1107,8 +1105,6 @@ SPDesktopWidget::shutdown()
             switch (response) {
             case GTK_RESPONSE_YES:
             {
-                Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
-
                 doc->doRef();
                 sp_namedview_document_from_window(desktop);
                 if (sp_file_save_document(*window, doc)) {
@@ -1162,8 +1158,6 @@ SPDesktopWidget::shutdown()
             {
                 doc->doRef();
 
-                Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
-
                 if (sp_file_save_dialog(*window, doc, Inkscape::Extension::FILE_SAVE_METHOD_INKSCAPE_SVG)) {
                     doc->doUnref();
                 } else { // save dialog cancelled or save failed
@@ -1279,11 +1273,6 @@ SPDesktopWidget::letZoomGrabFocus()
 void
 SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
 {
-    gboolean vis = gtk_widget_get_visible (GTK_WIDGET(this));
-    (void)vis; // TODO figure out why it is here but not used.
-
-    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
-
     if (window)
     {
         window->get_size (w, h);
@@ -1294,8 +1283,6 @@ SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
 void
 SPDesktopWidget::setWindowPosition (Geom::Point p)
 {
-    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
-
     if (window)
     {
         window->move (gint(round(p[Geom::X])), gint(round(p[Geom::Y])));
@@ -1305,8 +1292,6 @@ SPDesktopWidget::setWindowPosition (Geom::Point p)
 void
 SPDesktopWidget::setWindowSize (gint w, gint h)
 {
-    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
-
     if (window)
     {
         window->set_default_size (w, h);
@@ -1323,7 +1308,6 @@ SPDesktopWidget::setWindowSize (gint w, gint h)
 void
 SPDesktopWidget::setWindowTransient (void *p, int transient_policy)
 {
-    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
     if (window)
     {
         GtkWindow *w = GTK_WINDOW(window->gobj());