Remove last remnants of ancient plugin support. Tidy up acinclude.m4.

(bzr r7278)

5 files changed, 0 insertions, 23 deletions

diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index de656201c..a83cac88d 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -26,7 +26,6 @@ gchar const * Dependency::_type_str[] = {
     "executable",
     "file",
     "extension",
-    "plugin",
 };
 
 // These strings are for XML attribute comparisons and should not be translated
@@ -101,10 +100,6 @@ Dependency::~Dependency (void)
     looked up in the database.  If the extension is found, and it is
     not deactivated, the dependency passes.
 
-    If the type is \c TYPE_PLUGIN then the path for the plugin is found
-    using the Glib::Module routines.  When the path is found, then there
-    is a check to see if the file exists using the \c file_test function.
-
     If the type is \c TYPE_EXECUTABLE or \c TYPE_FILE things are getting
     even more interesting because now the \c _location variable is also
     taken into account.  First, the difference between the two is that
@@ -138,16 +133,6 @@ Dependency::check (void) const
             if (myext->deactivated()) return FALSE;
             break;
         }
-        case TYPE_PLUGIN: {
-            if (!Glib::Module::get_supported()) {
-                return FALSE;
-            }
-
-            std::string path = Glib::Module::build_path(INKSCAPE_PLUGINDIR, _string);
-            if (!Glib::file_test(path, Glib::FILE_TEST_EXISTS))
-                return FALSE;
-            break;
-        }
         case TYPE_EXECUTABLE:
         case TYPE_FILE: {
             Glib::FileTest filetest = Glib::FILE_TEST_EXISTS;
diff --git a/src/extension/dependency.h b/src/extension/dependency.h
index b76e30407..829912dc3 100644
--- a/src/extension/dependency.h
+++ b/src/extension/dependency.h
@@ -32,7 +32,6 @@ class Dependency {
         TYPE_EXECUTABLE, /**< Look for an executable */
         TYPE_FILE,       /**< Look to make sure a file exists */
         TYPE_EXTENSION,  /**< Make sure a specific extension is loaded and functional */
-        TYPE_PLUGIN,     /**< Look for a library to be loaded as a plugin */
         TYPE_CNT         /**< Number of types */
     };
     /** \brief  Storing the type of this particular dependency. */
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index f7542855e..1f6f8459c 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -45,7 +45,6 @@ Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename)
                 case MARKERS: temp = INKSCAPE_MARKERSDIR; break;
                 case PALETTES: temp = INKSCAPE_PALETTESDIR; break;
                 case PATTERNS: temp = INKSCAPE_PATTERNSDIR; break;
-                case PLUGINS: temp = INKSCAPE_PLUGINDIR; break;
                 case SCREENS: temp = INKSCAPE_SCREENSDIR; break;
                 case TEMPLATES: temp = INKSCAPE_TEMPLATESDIR; break;
                 case TUTORIALS: temp = INKSCAPE_TUTORIALSDIR; break;
@@ -74,7 +73,6 @@ Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename)
                 case MARKERS: name = "markers"; break;
                 case PALETTES: name = "palettes"; break;
                 case PATTERNS: name = "patterns"; break;
-                case PLUGINS: name = "plugins"; break;
                 case TEMPLATES: name = "templates"; break;
                 default: return get_path(SYSTEM, type, filename);
             }
diff --git a/src/io/resource.h b/src/io/resource.h
index 0be8ab8e6..a5269899f 100644
--- a/src/io/resource.h
+++ b/src/io/resource.h
@@ -32,7 +32,6 @@ enum Type {
     MARKERS,
     PALETTES,
     PATTERNS,
-    PLUGINS,
     SCREENS,
     TEMPLATES,
     TUTORIALS,
diff --git a/src/path-prefix.h b/src/path-prefix.h
index 447ddcf85..b2ff6ff88 100644
--- a/src/path-prefix.h
+++ b/src/path-prefix.h
@@ -34,7 +34,6 @@ extern "C" {
 #  define INKSCAPE_PATTERNSDIR    BR_DATADIR( "/inkscape/patterns" )
 #  define INKSCAPE_SCREENSDIR     BR_DATADIR( "/inkscape/screens" )
 #  define INKSCAPE_TUTORIALSDIR   BR_DATADIR( "/inkscape/tutorials" )
-#  define INKSCAPE_PLUGINDIR      BR_LIBDIR(  "/inkscape/plugins" )
 #  define INKSCAPE_TEMPLATESDIR   BR_DATADIR( "/inkscape/templates" )
 #  define INKSCAPE_UIDIR          BR_DATADIR( "/inkscape/ui" )
 //CREATE V0.1 support
@@ -56,7 +55,6 @@ extern "C" {
 #    define INKSCAPE_PATTERNSDIR  WIN32_DATADIR("share\\patterns")
 #    define INKSCAPE_SCREENSDIR   WIN32_DATADIR("share\\screens")
 #    define INKSCAPE_TUTORIALSDIR WIN32_DATADIR("share\\tutorials")
-#    define INKSCAPE_PLUGINDIR    WIN32_DATADIR("plugins")
 #    define INKSCAPE_TEMPLATESDIR WIN32_DATADIR("share\\templates")
 #    define INKSCAPE_UIDIR        WIN32_DATADIR("share\\ui")
 //CREATE V0.1  WIN32 support
@@ -77,7 +75,6 @@ extern "C" {
 #    define INKSCAPE_PATTERNSDIR  "Contents/Resources/patterns"
 #    define INKSCAPE_SCREENSDIR   "Contents/Resources/screens"
 #    define INKSCAPE_TUTORIALSDIR "Contents/Resources/tutorials"
-#    define INKSCAPE_PLUGINDIR    "Contents/Resources/plugins"
 #    define INKSCAPE_TEMPLATESDIR "Contents/Resources/templates"
 #    define INKSCAPE_UIDIR        "Contents/Resources/ui"
 //CREATE V0.1 support
@@ -98,7 +95,6 @@ extern "C" {
 #    define INKSCAPE_PATTERNSDIR  INKSCAPE_DATADIR "/inkscape/patterns"
 #    define INKSCAPE_SCREENSDIR   INKSCAPE_DATADIR "/inkscape/screens"
 #    define INKSCAPE_TUTORIALSDIR INKSCAPE_DATADIR "/inkscape/tutorials"
-#    define INKSCAPE_PLUGINDIR    INKSCAPE_LIBDIR  "/inkscape/plugins"
 #    define INKSCAPE_TEMPLATESDIR INKSCAPE_DATADIR "/inkscape/templates"
 #    define INKSCAPE_UIDIR        INKSCAPE_DATADIR "/inkscape/ui"
 //CREATE V0.1 support