X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fextension%2Finit.cpp;h=dc39ea430538286895a6eb80e13c8d1eaa3d1e1b;hb=6e5b442de6ae6214bccca73a6bf67d1dbb32e41e;hp=3a9f1e9aadcee8b822d8b9deeda7f3f6e8bc3205;hpb=77f2a5f29601711a1177eef5a01855e9cdb30b34;p=inkscape.git

diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 3a9f1e9aa..dc39ea430 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -19,23 +19,18 @@
 
 
 #include "inkscape.h"
+#include <glibmm/ustring.h>
 #include <glibmm/i18n.h>
 
 #include "system.h"
 #include "db.h"
 #include "internal/svgz.h"
-#include "internal/ps.h"
-#ifdef HAVE_CAIRO_PDF
-# include "internal/pdf-cairo.h"
-#endif
 #ifdef WIN32
 # include "internal/win32.h"
 # include "internal/emf-win32-inout.h"
 # include "internal/emf-win32-print.h"
 #endif
-#include "internal/ps-out.h"
 #ifdef HAVE_CAIRO_PDF
-# include "internal/cairo-pdf-out.h"
 # include "internal/cairo-renderer-pdf-out.h"
 # include "internal/cairo-png-out.h"
 # include "internal/cairo-ps-out.h"
@@ -47,17 +42,22 @@
 # include "internal/pdf-input-cairo.h"
 #endif
 #include "internal/pov-out.h"
+#include "internal/javafx-out.h"
 #include "internal/odf.h"
 #include "internal/latex-pstricks-out.h"
 #include "internal/latex-pstricks.h"
-#include "internal/eps-out.h"
 #include "internal/gdkpixbuf-input.h"
 #include "internal/bluredge.h"
 #include "internal/gimpgrad.h"
 #include "internal/grid.h"
+#ifdef WITH_LIBWPG
 #include "internal/wpg-input.h"
-#include "prefs-utils.h"
+#endif
+#include "preferences.h"
 #include "io/sys.h"
+#ifdef WITH_DBUS
+#include "dbus/dbus-init.h"
+#endif
 
 #ifdef WITH_IMAGE_MAGICK
 #include "internal/bitmap/adaptiveThreshold.h"
@@ -96,6 +96,8 @@
 #include "internal/bitmap/wave.h"
 #endif /* WITH_IMAGE_MAGICK */
 
+#include "internal/filter/filter.h"
+
 extern gboolean inkscape_app_use_gui( Inkscape::Application const *app );
 
 namespace Inkscape {
@@ -113,16 +115,15 @@ static void check_extensions();
  * \brief     Examines the given string preference and checks to see
  *            that at least one of the registered extensions matches
  *            it.  If not, a default is assigned.
- * \param     pref_path        Preference path to load
- * \param     pref_attr        Attribute to load from the preference
+ * \param     pref_path        Preference path to update
  * \param     pref_default     Default string to set
  * \param     extension_family List of extensions to search
  */
 static void
-update_pref(gchar const *pref_path, gchar const *pref_attr,
+update_pref(Glib::ustring const &pref_path,
             gchar const *pref_default) // , GSList *extension_family)
 {
-    gchar const *pref = prefs_get_string_attribute(pref_path,pref_attr);
+    Glib::ustring pref = Inkscape::Preferences::get()->getString(pref_path);
     /*
     gboolean missing=TRUE;
     for (GSList *list = extension_family; list; list = g_slist_next(list)) {
@@ -134,8 +135,8 @@ update_pref(gchar const *pref_path, gchar const *pref_attr,
         if (!strcmp(extension->get_id(),pref)) missing=FALSE;
     }
     */
-    if (!Inkscape::Extension::db.get( pref ) /*missing*/) {
-        prefs_set_string_attribute(pref_path, pref_attr, pref_default);
+    if (!Inkscape::Extension::db.get( pref.data() ) /*missing*/) {
+        Inkscape::Preferences::get()->setString(pref_path, pref_default);
     }
 }
 
@@ -152,23 +153,20 @@ init()
     /* TODO: Change to Internal */
     Internal::Svg::init();
     Internal::Svgz::init();
-    Internal::PsOutput::init();
-    Internal::EpsOutput::init();
-    Internal::PrintPS::init();
+
 #ifdef HAVE_CAIRO_PDF
-    Internal::CairoPdfOutput::init();
-    Internal::PrintCairoPDF::init();
-    if (0) {
+    //g_print ("Using CairoRendererPdfOutput: new pdf exporter\n");
     Internal::CairoRendererPdfOutput::init();
     Internal::CairoRendererOutput::init();
-    }
+
     Internal::CairoPsOutput::init();
+    Internal::CairoEpsOutput::init();
 #endif
 #ifdef HAVE_POPPLER
     Internal::PdfInput::init();
 #endif
 #ifdef HAVE_POPPLER_GLIB
-    if (1) {
+    if (0) {
     Internal::PdfInputCairo::init();
     }
 #endif
@@ -178,15 +176,22 @@ init()
     Internal::EmfWin32::init();
 #endif
     Internal::PovOutput::init();
+    Internal::JavaFXOutput::init();
     Internal::OdfOutput::init();
     Internal::PrintLatex::init();
     Internal::LatexOutput::init();
+#ifdef WITH_LIBWPG
     Internal::WpgInput::init();
+#endif
 
     /* Effects */
     Internal::BlurEdge::init();
     Internal::GimpGrad::init();
     Internal::Grid::init();
+
+#ifdef WITH_DBUS
+    Dbus::init();
+#endif
 	
     /* Raster Effects */
 #ifdef WITH_IMAGE_MAGICK
@@ -226,11 +231,15 @@ init()
     Internal::Bitmap::Wave::init();
 #endif /* WITH_IMAGE_MAGICK */
 
+	Internal::Filter::Filter::filters_all();
+
     /* Load search path for extensions */
     if (Inkscape::Extension::Extension::search_path.size() == 0)
     {
 	Inkscape::Extension::Extension::search_path.push_back(profile_path("extensions"));
+	
 	Inkscape::Extension::Extension::search_path.push_back(g_strdup(INKSCAPE_EXTENSIONDIR));
+
     }
 
     for (unsigned int i=0; i<Inkscape::Extension::Extension::search_path.size(); i++) {
@@ -249,7 +258,7 @@ init()
     /* This is a hack to deal with updating saved outdated module
      * names in the prefs...
      */
-    update_pref("dialogs.save_as", "default",
+    update_pref("/dialogs/save_as/default",
                 SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE
                 // Inkscape::Extension::db.get_output_list()
         );
@@ -290,7 +299,6 @@ build_module_from_dir(gchar const *dirname)
 
     gchar *filename;
     while ((filename = (gchar *)g_dir_read_name(directory)) != NULL) {
-
         if (strlen(filename) < strlen(SP_MODULE_EXTENSION)) {
             continue;
         }
@@ -299,12 +307,14 @@ build_module_from_dir(gchar const *dirname)
             continue;
         }
 
-        gchar *pathname = g_strdup_printf("%s/%s", dirname, filename);
+        gchar *pathname = g_build_filename(dirname, filename, NULL);
         build_from_file(pathname);
         g_free(pathname);
     }
 
     g_dir_close(directory);
+
+	return;
 }
 
 
@@ -329,7 +339,6 @@ check_extensions()
 
     Inkscape::Extension::Extension::error_file_open();
     while (count != 0) {
-        // printf("Check extensions pass %d\n", pass++);
         count = 0;
         db.foreach(check_extensions_internal, (gpointer)&count);
         if (count != 0) anyfail = true;