merge from trunk

(bzr r12417.1.24)

1 files changed, 10 insertions, 12 deletions

diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index d403d270f..0ff4b79c4 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -34,10 +34,10 @@
 #include "system.h"
 #include "db.h"
 #include "internal/svgz.h"
-#ifdef WIN32
-# include "internal/emf-win32-inout.h"
-# include "internal/emf-win32-print.h"
-#endif
+# include "internal/emf-inout.h"
+# include "internal/emf-print.h"
+# include "internal/wmf-inout.h"
+# include "internal/wmf-print.h"
 #ifdef HAVE_CAIRO_PDF
 # include "internal/cairo-renderer-pdf-out.h"
 # include "internal/cairo-png-out.h"
@@ -109,8 +109,6 @@
 
 #include "init.h"
 
-extern gboolean inkscape_app_use_gui( Inkscape::Application const *app );
-
 namespace Inkscape {
 namespace Extension {
 
@@ -181,10 +179,10 @@ init()
     Internal::PdfInputCairo::init();
     }
 #endif
-#ifdef WIN32
-    Internal::PrintEmfWin32::init();
-    Internal::EmfWin32::init();
-#endif
+    Internal::PrintEmf::init();
+    Internal::Emf::init();
+    Internal::PrintWmf::init();
+    Internal::Wmf::init();
     Internal::PovOutput::init();
     Internal::JavaFXOutput::init();
     Internal::OdfOutput::init();
@@ -295,7 +293,7 @@ static void
 build_module_from_dir(gchar const *dirname)
 {
     if (!dirname) {
-        g_warning(_("Null external module directory name.  Modules will not be loaded."));
+        g_warning("%s", _("Null external module directory name.  Modules will not be loaded."));
         return;
     }
 
@@ -324,7 +322,7 @@ build_module_from_dir(gchar const *dirname)
             continue;
         }
 
-        gchar *pathname = g_build_filename(dirname, filename, NULL);
+        gchar *pathname = g_build_filename(dirname, filename, (char *) NULL);
         build_from_file(pathname);
         g_free(pathname);
     }