summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-04-21 18:45:27 +0000
committerMarkus Engel <markus.engel@tum.de>2013-04-21 18:45:27 +0000
commit389b871cdea29ace85567863c439eb0537a36f54 (patch)
tree742ee2d623e5ecd4664e56818f4942833e1b6051 /src/desktop.cpp
parentSome refactoring in RectContext and StarContext. (diff)
downloadinkscape-389b871cdea29ace85567863c439eb0537a36f54.tar.gz
inkscape-389b871cdea29ace85567863c439eb0537a36f54.zip
Cleaned up a bit.
(bzr r11608.1.102)
Diffstat (limited to 'src/desktop.cpp')
-rw-r--r--src/desktop.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp
index d952fde35..2b768ede3 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -359,7 +359,8 @@ void SPDesktop::destroy()
// sp_event_context_finish (ec);
// g_object_unref (G_OBJECT (ec));
// }
- sp_event_context_finish(event_context);
+ //sp_event_context_finish(event_context);
+ event_context->finish();
//g_object_unref(G_OBJECT(event_context));
if (event_context) {
delete event_context;
@@ -694,8 +695,10 @@ SPDesktop::change_document (SPDocument *theDocument)
void SPDesktop::set_event_context2(const std::string& toolName) {
if (event_context) {
- sp_event_context_deactivate(event_context);
- sp_event_context_finish(event_context);
+ //sp_event_context_deactivate(event_context);
+ event_context->deactivate();
+ //sp_event_context_finish(event_context);
+ event_context->finish();
//g_object_unref(G_OBJECT(event_context));
delete event_context;
}