summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/undo-history.cpp
diff options
context:
space:
mode:
authorgustav_b <gustav_b@users.sourceforge.net>2006-10-01 18:57:05 +0000
committergustav_b <gustav_b@users.sourceforge.net>2006-10-01 18:57:05 +0000
commita8c615d56eda3f3e6ee05e9b133151daaeafae72 (patch)
treec32b5f6a6661b332058a1fad5e23d7238188dcf4 /src/ui/dialog/undo-history.cpp
parentOther tools now also retain there specific statusbar text when pressing alt/s... (diff)
downloadinkscape-a8c615d56eda3f3e6ee05e9b133151daaeafae72.tar.gz
inkscape-a8c615d56eda3f3e6ee05e9b133151daaeafae72.zip
Moved EventLog from SPDocument to SPDesktop to prevent it from being
created when Inkscape is started in non-gui mode. Fixes a critical assertion caused by creation of a Gtk::TreeStore. (bzr r1749)
Diffstat (limited to 'src/ui/dialog/undo-history.cpp')
-rw-r--r--src/ui/dialog/undo-history.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index e1b60f315..5cfba60f6 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -98,8 +98,9 @@ const CellRendererInt::Filter& CellRendererInt::no_filter = CellRendererInt::NoF
UndoHistory::UndoHistory()
: Dialog ("dialogs.undo-history", SP_VERB_DIALOG_UNDO_HISTORY),
+ _desktop (SP_ACTIVE_DESKTOP),
_document (SP_ACTIVE_DOCUMENT),
- _event_log (_document ? &_document->getEventLog() : NULL),
+ _event_log (_desktop ? _desktop->event_log : NULL),
_columns (_event_log ? &_event_log->getColumns() : NULL),
_event_list_selection (_event_list_view.get_selection())
{