Added code to initialize DBus (if enabled.)

[inkscape.git] / src / extension / internal / pov-out.cpp

diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 6b8a5ce070744cb441d3da50119fc146cd632710..f30cbc317a4413cd6b07270bd2542a15c3bfc86e 100644 (file)
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -22,7 +22,7 @@
 #endif
 #include "pov-out.h"
 #include <inkscape.h>
-#include <inkscape_version.h>
+#include <inkscape-version.h>
 #include <sp-path.h>
 #include <style.h>
 #include <display/curve.h>
@@ -201,7 +201,7 @@ bool PovOutput::doHeader()
     out("### This PovRay document was generated by Inkscape\n");
     out("### http://www.inkscape.org\n");
     out("### Created: %s",   ctime(&tim));
-    out("### Version: %s\n", INKSCAPE_VERSION);
+    out("### Version: %s\n", Inkscape::version_string);
     out("#####################################################################\n");
     out("### NOTES:\n");
     out("### ============\n");
@@ -576,7 +576,7 @@ void PovOutput::reset()
 /**
  * Saves the Shapes of an Inkscape SVG file as PovRay spline definitions
  */
-void PovOutput::saveDocument(SPDocument *doc, gchar const *uri)
+void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
 {
     reset();
 
@@ -584,7 +584,7 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *uri)
     //# Lets do the curves first, to get the stats
     if (!doTree(doc))
         {
-        err("Could not output curves for %s", uri);
+        err("Could not output curves for %s", filename_utf8);
         return;
         }
         
@@ -593,7 +593,7 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *uri)
 
     if (!doHeader())
         {
-        err("Could not write header for %s", uri);
+        err("Could not write header for %s", filename_utf8);
         return;
         }
 
@@ -601,7 +601,7 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *uri)
 
     if (!doTail())
         {
-        err("Could not write footer for %s", uri);
+        err("Could not write footer for %s", filename_utf8);
         return;
         }
 
@@ -609,8 +609,8 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *uri)
 
 
     //###### WRITE TO FILE
-    Inkscape::IO::dump_fopen_call(uri, "L");
-    FILE *f = Inkscape::IO::fopen_utf8name(uri, "w");
+    Inkscape::IO::dump_fopen_call(filename_utf8, "L");
+    FILE *f = Inkscape::IO::fopen_utf8name(filename_utf8, "w");
     if (!f)
         return;
 
@@ -641,9 +641,10 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *uri)
 */
 void
 PovOutput::save(Inkscape::Extension::Output */*mod*/,
-                        SPDocument *doc, gchar const *uri)
+                        SPDocument *doc, gchar const *filename_utf8)
 {
-    saveDocument(doc, uri);
+    /* See comments in JavaFSOutput::save re the name `filename_utf8'. */
+    saveDocument(doc, filename_utf8);
 }
 
 
@@ -678,7 +679,7 @@ PovOutput::init()
             "<output>\n"
                 "<extension>.pov</extension>\n"
                 "<mimetype>text/x-povray-script</mimetype>\n"
-                "<filetypename>" N_("PovRay (*.pov) (export splines)") "</filetypename>\n"
+                "<filetypename>" N_("PovRay (*.pov) (paths and shapes only)") "</filetypename>\n"
                 "<filetypetooltip>" N_("PovRay Raytracer File") "</filetypetooltip>\n"
             "</output>\n"
         "</inkscape-extension>",