From 207c0491084f51a46bd81ec60538dc48bedfe63f Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sat, 16 Mar 2013 16:26:03 +0000
Subject: Drop checks for ancient dependency versions.  These are satisfied
 elsewhere.

(bzr r12213)
---
 src/ui/dialog/dialog-manager.cpp   | 7 -------
 src/ui/dialog/svg-fonts-dialog.cpp | 4 ----
 2 files changed, 11 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index faba47769..993f48d8f 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -53,10 +53,7 @@
 #include "ui/dialog/export.h"
 #include "ui/dialog/xml-tree.h"
 #include "ui/dialog/clonetiler.h"
-
-#ifdef ENABLE_SVG_FONTS
 #include "ui/dialog/svg-fonts-dialog.h"
-#endif // ENABLE_SVG_FONTS
 
 namespace Inkscape {
 namespace UI {
@@ -118,9 +115,7 @@ DialogManager::DialogManager() {
         registerFactory("ObjectProperties",    &create<ObjectProperties,     FloatingBehavior>);
 //        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       FloatingBehavior>);
         registerFactory("Script",              &create<ScriptDialog,         FloatingBehavior>);
-#ifdef ENABLE_SVG_FONTS
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       FloatingBehavior>);
-#endif
         registerFactory("Swatches",            &create<SwatchesPanel,        FloatingBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        FloatingBehavior>);
         registerFactory("TileDialog",          &create<TileDialog,           FloatingBehavior>);
@@ -154,9 +149,7 @@ DialogManager::DialogManager() {
         registerFactory("ObjectProperties",    &create<ObjectProperties,     DockBehavior>);
 //        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       DockBehavior>);
         registerFactory("Script",              &create<ScriptDialog,         DockBehavior>);
-#ifdef ENABLE_SVG_FONTS
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       DockBehavior>);
-#endif
         registerFactory("Swatches",            &create<SwatchesPanel,        DockBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        DockBehavior>);
         registerFactory("TileDialog",          &create<TileDialog,           DockBehavior>);
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 0da39dd73..bce63093d 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -15,8 +15,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
-
 #include "svg-fonts-dialog.h"
 #include "document-private.h"
 #include "document-undo.h"
@@ -945,8 +943,6 @@ SvgFontsDialog::~SvgFontsDialog(){}
 } // namespace UI
 } // namespace Inkscape
 
-#endif //#ifdef ENABLE_SVG_FONTS
-
 /*
   Local Variables:
   mode:c++
-- 
cgit v1.2.3