Remove more whiteboard related leftovers.

(bzr r13543)

8 files changed, 1 insertions, 47 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34d428dee..1a0ba731e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # CMake TODO
 # - Remove hard coded defines (see bwelow)
 # - Test on MinGW and OSX
-# - Add configurable options for Python/Perl/Whiteboard, see configure --help
+# - Add configurable options for Python/Perl, see configure --help
 #
 # ideasman42
 
diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py
index 24cb22002..9b36cf297 100644
--- a/CMakeScripts/cmake_consistency_check_config.py
+++ b/CMakeScripts/cmake_consistency_check_config.py
@@ -5,13 +5,10 @@ IGNORE = (
     "/cxxtest/",
     "/dom/work/",
     "/extension/dbus/",
-    "/pedro/",
     "/src/extension/dxf2svg/",
 
     # files
     "buildtool.cpp",
-    "jabber_whiteboard/node-tracker.cpp",
-    "jabber_whiteboard/node-utilities.cpp",
     "packaging/macosx/ScriptExec/main.c",
     "share/ui/keybindings.rc",
     "src/2geom/conic_section_clipper_impl.cpp",
@@ -31,10 +28,6 @@ IGNORE = (
     "src/libnr/testnr.cp",
     "src/live_effects/lpe-skeleton.cpp",
     "src/svg/test-stubs.cpp",
-    "src/ui/dialog/session-player.cpp",
-    "src/ui/dialog/whiteboard-connect.cpp",
-    "src/ui/dialog/whiteboard-sharewithchat.cpp",
-    "src/ui/dialog/whiteboard-sharewithuser.cpp",
     "src/winconsole.cpp",
 
     # header files
diff --git a/build-lx.xml b/build-lx.xml
index f006c9edc..c99f147f4 100644
--- a/build-lx.xml
+++ b/build-lx.xml
@@ -161,10 +161,6 @@
         /* internal interpreter */
         #define WITH_PYTHON                   1
 
-        /* shared whiteboard */
-        #undef WITH_INKBOARD
-        #undef HAVE_SSL
-        
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
         #define HAVE_POPPLER_CAIRO            1
@@ -256,21 +252,6 @@
             <exclude name="xml/test-xml.cpp"/>
             <exclude name="xml/test-xml-main.cpp"/>
             <exclude name="io/streamtest.cpp"/>
-            <!--JABBER-->
-            <exclude name="pedro/pedrogui.cpp"/>
-            <exclude name="pedro/pedrogui.h"/>
-            <exclude name="pedro/work/.*"/>
-            <!--WHITEBOARD-->
-            <exclude name="ui/dialog/session-player.cpp"/>
-            <exclude name="ui/dialog/whiteboard-connect.cpp"/>
-            <exclude name="ui/dialog/whiteboard-sharewithchat.cpp"/>
-            <exclude name="ui/dialog/whiteboard-sharewithuser.cpp"/>
-            <exclude name="dialogs/whiteboard-connect-dialog.cpp"/>
-            <exclude name="dialogs/whiteboard-common-dialog.cpp"/>
-            <exclude name="dialogs/whiteboard-sharewithchat-dialog.cpp"/>
-            <exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
-            <exclude name="jabber_whiteboard/node-tracker.cpp"/>
-            <exclude name="jabber_whiteboard/node-utilities.cpp"/>
             <!--OVERLAP-->
             <exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
             <exclude name="removeoverlap/placement_SolveVPSC.h"/>
diff --git a/build-x64.xml b/build-x64.xml
index 836c10f38..285d2256b 100644
--- a/build-x64.xml
+++ b/build-x64.xml
@@ -178,10 +178,6 @@
         /* internal interpreter */
         #define WITH_PYTHON                   1
 
-        /* shared whiteboard */
-        #undef WITH_INKBOARD
-        #undef HAVE_SSL
-
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
         #define HAVE_POPPLER_GLIB             1
diff --git a/build.xml b/build.xml
index aef112c4d..9c8a89779 100644
--- a/build.xml
+++ b/build.xml
@@ -177,10 +177,6 @@
         /* internal interpreter */
         #define WITH_PYTHON                   1
 
-        /* shared whiteboard */
-        #undef WITH_INKBOARD
-        #undef HAVE_SSL
-
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
         #define HAVE_POPPLER_GLIB             1
diff --git a/share/ui/menus-bars.xml b/share/ui/menus-bars.xml
index ade758788..5ff7f5b83 100644
--- a/share/ui/menus-bars.xml
+++ b/share/ui/menus-bars.xml
@@ -173,13 +173,6 @@
       <separator/>
       <menuitem action='RemoveManualKerns'/>
     </menu>
-	<menu action='MenuWhiteboard'>
-	  <menuitem action='DialogWhiteboardConnect'/>
-	  <separator/>
-	  <menuitem action='DialogWhiteboardShareWithUser'/>
-	  <menuitem action='DialogWhiteboardShareWithChat'/>
-	  <separator/>
-	</menu>
     <menu action='MenuHelp'>
       <menuitem action='KeysAndMouse'/>
       <menu action='Tutorials'>
diff --git a/src/document.cpp b/src/document.cpp
index f79a00178..f94a9f04f 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -229,7 +229,6 @@ SPDocument::~SPDocument() {
     // This is at the end of the destructor, because preceding code adds new orphans to the queue
     collectOrphans();
 
-    //delete this->_whiteboard_session_manager;
 }
 
 sigc::connection SPDocument::connectDestroy(sigc::signal<void>::slot_type slot)
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 7d80f1e36..2b9dd6e45 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -89,7 +89,6 @@ set(ui_SRC
 	dialog/print.cpp
 	dialog/symbols.cpp
 	dialog/xml-tree.cpp
-	# dialog/session-player.cpp
 	dialog/spellcheck.cpp
 	dialog/svg-fonts-dialog.cpp
 	dialog/swatches.cpp
@@ -101,9 +100,6 @@ set(ui_SRC
 	dialog/pixelartdialog.cpp
 	dialog/transformation.cpp
 	dialog/undo-history.cpp
-	# dialog/whiteboard-connect.cpp
-	# dialog/whiteboard-sharewithchat.cpp
-	# dialog/whiteboard-sharewithuser.cpp
 
 	widget/anchor-selector.cpp
 	widget/button.cpp