5 files changed, 16 insertions, 5 deletions
diff --git a/src/file.cpp b/src/file.cpp
index 8f40d7e4b..420eaec63 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1123,9 +1123,6 @@ sp_file_import(Gtk::Window &parentWindow)
 ## E X P O R T
 ######################*/
 
-//#define NEW_EXPORT_DIALOG
-
-
 
 #ifdef NEW_EXPORT_DIALOG
 
@@ -1192,7 +1189,7 @@ sp_file_export_dialog(void *widget)
     if ( export_path_local.size() > 0)
         export_path = export_path_local;
 
-    //# Show the SaveAs dialog
+    //# Show the Export dialog
     Inkscape::UI::Dialog::FileExportDialog *exportDialogInstance =
         Inkscape::UI::Dialog::FileExportDialog::create(
             export_path,
diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index 8e372c394..68c0926aa 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -166,6 +166,8 @@ void FileSaveDialog::appendExtension(Glib::ustring& path, Inkscape::Extension::O
 //# F I L E     E X P O R T
 //########################################################################
 
+#ifdef NEW_EXPORT_DIALOG
+
 /**
  * Public factory method.  Used in file.cpp
  */
@@ -179,6 +181,8 @@ FileExportDialog *FileExportDialog::create(Gtk::Window& parentWindow,
     return dialog;
 }
 
+#endif // NEW_EXPORT_DIALOG
+
 
 } //namespace Dialog
 } //namespace UI
diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h
index f7be86ef3..472c4ac0b 100644
--- a/src/ui/dialog/filedialog.h
+++ b/src/ui/dialog/filedialog.h
@@ -228,7 +228,9 @@ protected:
 }; //FileSaveDialog
 
 
+//#define NEW_EXPORT_DIALOG
 
+#ifdef NEW_EXPORT_DIALOG
 
 /**
  * This class provides an implementation-independent API for
@@ -366,12 +368,13 @@ public:
 
 }; //FileExportDialog
 
+#endif // NEW_EXPORT_DIALOG
+
 
 } //namespace Dialog
 } //namespace UI
 } //namespace Inkscape
 
-
 #endif /* __FILE_DIALOG_H__ */
 
 /*
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 3e681bd3b..e650cf842 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -1251,6 +1251,8 @@ void FileSaveDialogImplGtk::updateNameAndExtension()
 }
 
 
+#ifdef NEW_EXPORT_DIALOG
+
 //########################################################################
 //# F I L E     E X P O R T
 //########################################################################
@@ -1607,6 +1609,8 @@ FileExportDialogImpl::getFilename()
     return myFilename;
 }
 
+#endif // NEW_EXPORT_DIALOG
+
 
 } //namespace Dialog
 } //namespace UI
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index ac868fecc..65bb38971 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -357,6 +357,8 @@ private:
 
 
 
+#ifdef NEW_EXPORT_DIALOG
+
 //########################################################################
 //# F I L E     E X P O R T
 //########################################################################
@@ -573,6 +575,7 @@ private:
     Glib::ustring myFilename;
 };
 
+#endif // NEW_EXPORT_DIALOG
 
 } // namespace Dialog
 } // namespace UI