diff options
| author | daleharvey <daleharvey@users.sourceforge.net> | 2006-06-23 13:15:16 +0000 |
|---|---|---|
| committer | daleharvey <daleharvey@users.sourceforge.net> | 2006-06-23 13:15:16 +0000 |
| commit | fcadbfb31e9e8bd463a16369e3de2ec96a413a6a (patch) | |
| tree | 41c3f39b304687f41ec169c8aa95a5984aa5910f /src/desktop.cpp | |
| parent | quick g_message UndoStackObserver for tracing calls to the undo system (diff) | |
| download | inkscape-fcadbfb31e9e8bd463a16369e3de2ec96a413a6a.tar.gz inkscape-fcadbfb31e9e8bd463a16369e3de2ec96a413a6a.zip | |
manually merging the INKBOARD_PEDRO branch into trunk
(bzr r1268)
Diffstat (limited to 'src/desktop.cpp')
| -rw-r--r-- | src/desktop.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 7d9904342..49a43bc37 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -77,10 +77,6 @@ #include "message-context.h" #include "layer-manager.h" -#ifdef WITH_INKBOARD -#include "jabber_whiteboard/session-manager.h" -#endif - namespace Inkscape { namespace XML { class Node; }} // Callback declarations @@ -245,14 +241,6 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas) /* Ugly hack */ _namedview_modified (namedview, SP_OBJECT_MODIFIED_FLAG, this); - /* Construct SessionManager - * - * SessionManager construction needs to be done after document connection - */ -#ifdef WITH_INKBOARD - _whiteboard_session_manager = new Inkscape::Whiteboard::SessionManager(this); -#endif - /* Set up notification of rebuilding the document, this allows for saving object related settings in the document. */ _reconstruction_start_connection = @@ -325,12 +313,6 @@ void SPDesktop::destroy() drawing = NULL; } -#ifdef WITH_INKBOARD - if (_whiteboard_session_manager) { - delete _whiteboard_session_manager; - } -#endif - delete _guides_message_context; _guides_message_context = NULL; |