Updated buildtool's files to undefine whiteboard. Comment out OCAL Export dialog...

diff --git a/build-lx.xml b/build-lx.xml
index 4335ca3c09910d4a845543fdf4f425bcf06b5261..4d363c0c072b71f15ffd396795a823096353ed65 100644 (file)
--- a/build-lx.xml
+++ b/build-lx.xml
@@ -160,8 +160,8 @@
         #define WITH_PYTHON                   1
 
         /* shared whiteboard */
-        #define WITH_INKBOARD                 1
-        #define HAVE_SSL                      1
+        #undef WITH_INKBOARD                 1
+        #undef HAVE_SSL                      1
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1

diff --git a/build.xml b/build.xml
index 384251fc6796aa1530483864b9d213fc508de722..130a0ac54f2612e9befe8e0a35cdf974b1e410d5 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -166,8 +166,8 @@
         #define WITH_PYTHON                   1
 
         /* shared whiteboard */
-        #define WITH_INKBOARD                 1
-        #define HAVE_SSL                      1
+        #undef WITH_INKBOARD                 1
+        #undef HAVE_SSL                      1
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1

diff --git a/src/file.cpp b/src/file.cpp
index 924ddc53d7595e7b54cdeb66faba007b66e500fd..ef9706c334635e41397d7a81a54e8c01fac0dfb4 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -68,9 +68,9 @@
 # include <libgnomevfs/gnome-vfs.h>
 #endif
 
-#ifdef WITH_INKBOARD
-#include "jabber_whiteboard/session-manager.h"
-#endif
+//#ifdef WITH_INKBOARD
+//#include "jabber_whiteboard/session-manager.h"
+//#endif
 
 #ifdef WIN32
 #include <windows.h>
@@ -1270,6 +1270,7 @@ sp_file_export_dialog(Gtk::Window &/*parentWindow*/)
 /**
  *  Display an Export dialog, export as the selected type if OK pressed
  */
+/*
 bool
 sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow)
 {
@@ -1406,10 +1407,11 @@ sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow)
 
     return success;
 }
-
+*/
 /**
  * Export the current document to OCAL
  */
+/*
 void
 sp_file_export_to_ocal(Gtk::Window &parentWindow)
 {
@@ -1421,7 +1423,7 @@ sp_file_export_to_ocal(Gtk::Window &parentWindow)
     if (success)
         SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Document exported..."));
 }
-
+*/
 
 /*######################
 ## I M P O R T  F R O M  O C A L

diff --git a/src/file.h b/src/file.h
index 770e519abb541bc0d63b7d73f96d9b6adb432821..97d1bd5f8a3f2abef0ae55c6b52b8f0707affb6a 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -151,13 +151,13 @@ bool sp_file_export_dialog (Gtk::Window &parentWindow);
 /**
  * Export the current document to OCAL
  */
-void sp_file_export_to_ocal (Gtk::Window &parentWindow );
+//void sp_file_export_to_ocal (Gtk::Window &parentWindow );
 
 
 /**
  * Export the current document to OCAL
  */
-bool sp_file_export_to_ocal_dialog (void *widget);
+//bool sp_file_export_to_ocal_dialog (void *widget);
 
 
 /*######################

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index a4bdcfd9ae0b5e198e65946aa007dc184808677c..c4a789e48de2323640251809725ebadbb6b88182 100644 (file)
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -29,7 +29,7 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"FileExport\" />\n"
 #ifdef WITH_GNOME_VFS
 "       <verb verb-id=\"FileImportFromOCAL\" />\n"
-"       <verb verb-id=\"FileExportToOCAL\" />\n"
+//"       <verb verb-id=\"FileExportToOCAL\" />\n"
 #endif
 "       <separator/>\n"
 "       <verb verb-id=\"FilePrint\" />\n"

diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index ba572336cf50df620cc7555f6a4d18f1b270afeb..d3887b1ca5c0e7928193025a1287b6d8a8defca6 100644 (file)
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -41,6 +41,7 @@ namespace Dialog
 /**
  * Callback for fileNameEntry widget
  */
+/*
 void FileExportToOCALDialog::fileNameEntryChangedCallback()
 {
     if (!fileNameEntry)
@@ -53,25 +54,32 @@ void FileExportToOCALDialog::fileNameEntryChangedCallback()
     myFilename = fileName;
     response(Gtk::RESPONSE_OK);
 }
-
+*/
 /**
  * Constructor
  */
+/*
 FileExportToOCALDialog::FileExportToOCALDialog(Gtk::Window &parentWindow,
             FileDialogType fileTypes,
             const Glib::ustring &title) :
     FileDialogOCALBase(title, parentWindow)
 {
-    /*
+*/
+     /*
      * Start Taking the vertical Box and putting a Label
      * and a Entry to take the filename
      * Later put the extension selection and checkbox (?)
      */
     /* Initalize to Autodetect */
+/*
     extension = NULL;
+*/
     /* No filename to start out with */
+/*
     myFilename = "";
+*/
     /* Set our dialog type (save, export, etc...)*/
+/*
     dialogType = fileTypes;
     Gtk::VBox *vbox = get_vbox();
 
@@ -102,17 +110,19 @@ FileExportToOCALDialog::FileExportToOCALDialog(Gtk::Window &parentWindow,
 
     show_all_children();
 }
-
+*/
 /**
  * Destructor
  */
+/*
 FileExportToOCALDialog::~FileExportToOCALDialog()
 {
 }
-
+*/
 /**
  * Show this dialog modally.  Return true if user hits [OK]
  */
+/*
 bool
 FileExportToOCALDialog::show()
 {
@@ -130,10 +140,11 @@ FileExportToOCALDialog::show()
         return FALSE;
         }
 }
-
+*/
 /**
  * Get the file name chosen by the user.   Valid after an [OK]
  */
+/*
 Glib::ustring
 FileExportToOCALDialog::getFilename()
 {
@@ -150,7 +161,7 @@ FileExportToOCALDialog::change_title(const Glib::ustring& title)
 {
     this->set_title(title);
 }
-
+*/
 
 //########################################################################
 //# F I L E    E X P O R T   T O   O C A L   P A S S W O R D
@@ -160,14 +171,17 @@ FileExportToOCALDialog::change_title(const Glib::ustring& title)
 /**
  * Constructor
  */
+/*
 FileExportToOCALPasswordDialog::FileExportToOCALPasswordDialog(Gtk::Window &parentWindow,
                              const Glib::ustring &title) : FileDialogOCALBase(title, parentWindow)
 {
+*/
     /*
      * Start Taking the vertical Box and putting 2 Labels
      * and 2 Entries to take the username and password
      */
     /* No username and password to start out with */
+/*
     myUsername = "";
     myPassword = "";
 
@@ -200,18 +214,20 @@ FileExportToOCALPasswordDialog::FileExportToOCALPasswordDialog(Gtk::Window &pare
 
     show_all_children();
 }
-
+*/
 
 /**
  * Destructor
  */
+/*
 FileExportToOCALPasswordDialog::~FileExportToOCALPasswordDialog()
 {
 }
-
+*/
 /**
  * Show this dialog modally.  Return true if user hits [OK]
  */
+/*
 bool
 FileExportToOCALPasswordDialog::show()
 {
@@ -229,20 +245,22 @@ FileExportToOCALPasswordDialog::show()
         return FALSE;
     }
 }
-
+*/
 /**
  * Get the username.   Valid after an [OK]
  */
+/*
 Glib::ustring
 FileExportToOCALPasswordDialog::getUsername()
 {
     myUsername = usernameEntry->get_text();
     return myUsername;
 }
-
+*/
 /**
  * Get the password.   Valid after an [OK]
  */
+/*
 Glib::ustring
 FileExportToOCALPasswordDialog::getPassword()
 {
@@ -255,7 +273,7 @@ FileExportToOCALPasswordDialog::change_title(const Glib::ustring& title)
 {
     this->set_title(title);
 }
-
+*/
 
 //#########################################################################
 //### F I L E   I M P O R T   F R O M   O C A L

diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index 75d57fc592e6bba07a0b1c4cac3ec8bb6751cd78..ce26f2148434b6d2ddcf66f12e63c8c057a7225e 100644 (file)
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -105,75 +105,86 @@ protected:
 /**
  * Our implementation of the FileExportToOCALDialog interface.
  */
+/*
 class FileExportToOCALDialog : public FileDialogOCALBase
 {
 
 public:
+*/
     /**
      * Constructor
      * @param fileTypes one of FileDialogTypes
      * @param title the title of the dialog
      * @param key a list of file types from which the user can select
      */
+/*
     FileExportToOCALDialog(Gtk::Window& parentWindow, 
                              FileDialogType fileTypes,
-                            const Glib::ustring &title);
-    
+                 const Glib::ustring &title);
+*/
     /**
      * Destructor.
      * Perform any necessary cleanups.
      */
+/*
     ~FileExportToOCALDialog();
-
+*/
     /**
      * Show an SaveAs file selector.
      * @return the selected path if user selected one, else NULL
      */
+/*
     bool show();
 
     Glib::ustring getFilename();
 
     Glib::ustring myFilename;
-
+*/
     /**
      * Change the window title.
      */
+/*
     void change_title(const Glib::ustring& title);
     
 private:
-
+*/
     /**
      * Fix to allow the user to type the file name
      */
+/*
     Gtk::Entry *fileNameEntry;
-    
+*/
     /**
      *  Data mirror of the combo box
      */
+/*
     std::vector<FileType> fileTypes;
 
     // Child widgets
     Gtk::HBox childBox;
     Gtk::VBox checksBox;
     Gtk::HBox fileBox;
-
+*/
     /**
      * The extension to use to write this file
      */
+/*
     Inkscape::Extension::Extension *extension;
-
+*/
     /**
      * Callback for user input into fileNameEntry
      */
+/*
     void fileNameEntryChangedCallback();
-
+*/
     /**
      * List of known file extensions.
      */
+/*
     std::set<Glib::ustring> knownExtensions;
 
 }; //FileExportToOCAL
-
+*/
 
 //########################################################################
 //# F I L E    E X P O R T   T O   O C A L   P A S S W O R D
@@ -183,45 +194,52 @@ private:
 /**
  * Our implementation of the FileExportToOCALPasswordDialog interface.
  */
+/*
 class FileExportToOCALPasswordDialog : public FileDialogOCALBase
 {
 
 public:
+*/
     /**
      * Constructor
      * @param title the title of the dialog
      */
+/*
     FileExportToOCALPasswordDialog(Gtk::Window& parentWindow, 
                                 const Glib::ustring &title);
-    
+*/
     /**
      * Destructor.
      * Perform any necessary cleanups.
      */
+/*
     ~FileExportToOCALPasswordDialog();
-
+*/
 
     /**
      * Show 2 entry to input username and password.
      */
+/*
     bool show();
 
     Glib::ustring getUsername();
     Glib::ustring getPassword();
-
+*/
     /**
      * Change the window title.
      */
+/*
     void change_title(const Glib::ustring& title);
 
     Glib::ustring myUsername;
     Glib::ustring myPassword;
 
 private:
-
+*/
     /**
      * Fix to allow the user to type the file name
      */
+/*
     Gtk::Entry *usernameEntry;
     Gtk::Entry *passwordEntry;
     
@@ -231,7 +249,7 @@ private:
     Gtk::HBox passBox;
     
 }; //FileExportToOCALPassword
-
+*/
 
 
 //#########################################################################

diff --git a/src/verbs.cpp b/src/verbs.cpp
index b634e2a447492be02b9960a5bd334c2f41ba4f95..fd549e381a7fb8588c7c663084bd14b1d97bf44e 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -81,9 +81,9 @@
 #include "ui/dialog/swatches.h"
 #include "ui/icon-names.h"
 
-#ifdef WITH_INKBOARD
-#include "jabber_whiteboard/session-manager.h"
-#endif
+//#ifdef WITH_INKBOARD
+//#include "jabber_whiteboard/session-manager.h"
+//#endif
 
 /**
  * \brief Return the name without underscores and ellipsis, for use in dialog
@@ -804,9 +804,9 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/)
         case SP_VERB_FILE_IMPORT_FROM_OCAL:
             sp_file_import_from_ocal(*parent);
             break;
-        case SP_VERB_FILE_EXPORT_TO_OCAL:
-            sp_file_export_to_ocal(*parent);
-            break;
+//        case SP_VERB_FILE_EXPORT_TO_OCAL:
+//            sp_file_export_to_ocal(*parent);
+//            break;
         case SP_VERB_FILE_NEXT_DESKTOP:
             inkscape_switch_desktops_next();
             break;
@@ -1833,13 +1833,13 @@ DialogVerb::perform(SPAction *action, void *data, void */*pdata*/)
         case SP_VERB_DIALOG_ITEM:
             sp_item_dialog();
             break;
-#ifdef WITH_INKBOARD
+/*#ifdef WITH_INKBOARD
         case SP_VERB_XMPP_CLIENT:
         {
             Inkscape::Whiteboard::SessionManager::showClient();
             break;
         }
-#endif
+#endif*/
         case SP_VERB_DIALOG_INPUT:
             sp_input_dialog();
             break;
@@ -2263,7 +2263,7 @@ Verb *Verb::_base_verbs[] = {
     new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."),
                  N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON_DOCUMENT_EXPORT),
     new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import From Open Clip Art Library"), N_("Import a document from Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_IMPORT_OCAL),
-    new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL),
+//    new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL),
     new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"),
                  N_("Switch to the next document window"), INKSCAPE_ICON_WINDOW_NEXT),
     new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"),

diff --git a/src/verbs.h b/src/verbs.h
index c3b88918b7bac4311e2639d6523f00d557b4edc9..87fe27075fdcf230a669de9cc38dcd6daafb54c9 100644 (file)
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -45,7 +45,7 @@ enum {
     SP_VERB_FILE_IMPORT,
     SP_VERB_FILE_EXPORT,
     SP_VERB_FILE_IMPORT_FROM_OCAL, /**< Import the file from Open Clip Art Library */
-    SP_VERB_FILE_EXPORT_TO_OCAL, /**< Export the file to Open Clip Art  Library */
+//    SP_VERB_FILE_EXPORT_TO_OCAL, /**< Export the file to Open Clip Art  Library */
     SP_VERB_FILE_NEXT_DESKTOP,
     SP_VERB_FILE_PREV_DESKTOP,
     SP_VERB_FILE_CLOSE_VIEW,
@@ -238,9 +238,9 @@ enum {
     SP_VERB_DIALOG_TOGGLE,
     SP_VERB_DIALOG_CLONETILER,
     SP_VERB_DIALOG_ITEM,
-#ifdef WITH_INKBOARD
+/*#ifdef WITH_INKBOARD
     SP_VERB_XMPP_CLIENT,
-#endif
+#endif*/
     SP_VERB_DIALOG_INPUT,
     SP_VERB_DIALOG_INPUT2,
     SP_VERB_DIALOG_EXTENSIONEDITOR,