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/ui/dialog/dialog-manager.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/ui/dialog/dialog-manager.cpp')
| -rw-r--r-- | src/ui/dialog/dialog-manager.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index 80fae2c92..f4099b050 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -33,13 +33,6 @@ #include "ui/dialog/tracedialog.h" #include "ui/dialog/transformation.h" -#ifdef WITH_INKBOARD -#include "ui/dialog/whiteboard-sharewithchat.h" -#include "ui/dialog/whiteboard-sharewithuser.h" -#include "ui/dialog/whiteboard-connect.h" -#include "ui/dialog/session-player.h" -#endif - #include "ui/dialog/xml-editor.h" #include "dialogs/tiledialog.h" @@ -92,12 +85,6 @@ DialogManager::DialogManager() { registerFactory("TileDialog", &create<TileDialog>); registerFactory("Trace", &create<TraceDialog>); registerFactory("Transformation", &create<Transformation>); -#ifdef WITH_INKBOARD - registerFactory("SessionPlayer", &create<SessionPlaybackDialog>); - registerFactory("WhiteboardConnect", &create<WhiteboardConnectDialog>); - registerFactory("WhiteboardShareWithUser", &create<WhiteboardShareWithUserDialog>); - registerFactory("WhiteboardShareWithChat", &create<WhiteboardShareWithChatroomDialog>); -#endif registerFactory("XmlEditor", &create<XmlEditor>); } |