diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-04 17:21:11 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-04 17:21:11 +0000 |
| commit | 8764988ec95bd0fc0f26aaa79612284c8b667b9c (patch) | |
| tree | 768a538c555c5c44fa436af98931bc08965f7662 /src | |
| parent | Drop unused internal Python and Perl config checks (diff) | |
| download | inkscape-8764988ec95bd0fc0f26aaa79612284c8b667b9c.tar.gz inkscape-8764988ec95bd0fc0f26aaa79612284c8b667b9c.zip | |
Drop dead Inkboard code. Config flag no longer exists
(bzr r12173)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/desktop.h | 10 | ||||
| -rw-r--r-- | src/file.cpp | 4 | ||||
| -rw-r--r-- | src/menus-skeleton.h | 5 | ||||
| -rw-r--r-- | src/verbs.cpp | 15 | ||||
| -rw-r--r-- | src/verbs.h | 3 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 5 |
7 files changed, 0 insertions, 44 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b3aa5f60c..7d8a9ef50 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,7 +44,6 @@ all_libs = \ $(kdeldadd) \ $(win32ldflags) \ $(CARBON_LDFLAGS) \ - $(INKBOARD_LIBS) \ $(LIBWPG_LIBS) \ $(LIBVISIO_LIBS) \ $(LIBCDR_LIBS) \ @@ -69,7 +68,6 @@ AM_CPPFLAGS = \ $(GNOME_PRINT_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ $(IMAGEMAGICK_CFLAGS) \ - $(INKBOARD_CFLAGS) \ $(LIBWPG_CFLAGS) \ $(LIBVISIO_CFLAGS) \ $(LIBCDR_CFLAGS) \ diff --git a/src/desktop.h b/src/desktop.h index 93cf3201c..27176868f 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -214,16 +214,6 @@ public: return _layer_changed_signal.connect(slot); } - // Whiteboard changes - -#ifdef WITH_INKBOARD - Inkscape::Whiteboard::SessionManager* whiteboard_session_manager() { - return _whiteboard_session_manager; - } - - Inkscape::Whiteboard::SessionManager* _whiteboard_session_manager; -#endif - /** * Return new desktop object. * \pre namedview != NULL. diff --git a/src/file.cpp b/src/file.cpp index 468d02eba..97087c1a1 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -81,10 +81,6 @@ using Inkscape::DocumentUndo; #include "extension/dbus/dbus-init.h" #endif -//#ifdef WITH_INKBOARD -//#include "jabber_whiteboard/session-manager.h" -//#endif - #ifdef WIN32 #include <windows.h> #endif diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index fa39dbd3a..868b606a4 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -282,11 +282,6 @@ static char const menus_skeleton[] = " <separator/>\n" " <effects-list/>\n" " </submenu>\n" -#ifdef WITH_INKBOARD -" <submenu name=\"" N_("Whiteboa_rd") "\">\n" -" <verb verb-id=\"DialogXmppClient\" />\n" -" </submenu>\n" -#endif " <submenu name=\"" N_("_Help") "\">\n" " <verb verb-id=\"org.inkscape.help.manual\" />\n" " <verb verb-id=\"org.inkscape.help.keys\" />\n" diff --git a/src/verbs.cpp b/src/verbs.cpp index bbadb1a25..cdeeab99a 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -89,10 +89,6 @@ using Inkscape::DocumentUndo; using Inkscape::UI::Dialog::ActionAlign; -//#ifdef WITH_INKBOARD -//#include "jabber_whiteboard/session-manager.h" -//#endif - /** * Return the name without underscores and ellipsis, for use in dialog * titles, etc. Allocated memory must be freed by caller. @@ -1972,13 +1968,6 @@ void DialogVerb::perform(SPAction *action, void *data) //sp_item_dialog(); dt->_dlg_mgr->showDialog("ObjectProperties"); break; -/*#ifdef WITH_INKBOARD - case SP_VERB_XMPP_CLIENT: - { - Inkscape::Whiteboard::SessionManager::showClient(); - break; - } -#endif*/ case SP_VERB_DIALOG_INPUT: dt->_dlg_mgr->showDialog("InputDevices"); break; @@ -2796,10 +2785,6 @@ Verb *Verb::_base_verbs[] = { N_("Edit the object attributes..."), INKSCAPE_ICON("dialog-object-attributes")), new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogObjectProperties", N_("_Object Properties..."), N_("Edit the ID, locked and visible status, and other object properties"), INKSCAPE_ICON("dialog-object-properties")), -/*#ifdef WITH_INKBOARD - new DialogVerb(SP_VERB_XMPP_CLIENT, "DialogXmppClient", - N_("_Instant Messaging..."), N_("Jabber Instant Messaging Client"), NULL), -#endif*/ new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."), N_("Configure extended input devices, such as a graphics tablet"), INKSCAPE_ICON("dialog-input-devices")), new DialogVerb(SP_VERB_DIALOG_EXTENSIONEDITOR, "org.inkscape.dialogs.extensioneditor", N_("_Extensions..."), diff --git a/src/verbs.h b/src/verbs.h index c4a7b67e0..dab524d7a 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -282,9 +282,6 @@ enum { SP_VERB_DIALOG_CLONETILER, SP_VERB_DIALOG_ATTR, SP_VERB_DIALOG_ITEM, -/*#ifdef WITH_INKBOARD - SP_VERB_XMPP_CLIENT, -#endif*/ SP_VERB_DIALOG_INPUT, SP_VERB_DIALOG_EXTENSIONEDITOR, SP_VERB_DIALOG_LAYERS, diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 2a816adf4..b0d8d974e 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -82,11 +82,6 @@ using Inkscape::UI::UXManager; using Inkscape::UI::ToolboxFactory; using ege::AppearTimeTracker; -#ifdef WITH_INKBOARD -#endif - - - enum { ACTIVATE, DEACTIVATE, |
