Super duper mega (fun!) commit: replaced encoding=utf-8 with fileencoding=utf-8 in...

[inkscape.git] / src / io / resource.cpp

diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 267a82d0184c2b796ab5ef439f731ed518964beb..8c76c7132751142e7b8027afa442d8db614c3719 100644 (file)
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
 #include <glib/gfileutils.h>
@@ -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);
             }
@@ -108,4 +106,4 @@ Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename)
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :