SF.net SVN: openvrml:[3819] trunk

[<br...@us...>]

Revision: 3819
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3819&view=rev
Author:   braden
Date:     2009-03-02 01:16:04 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
Changed "model/x3d+vrml" to "model/x3d-vrml" in accordance with the pending media type registration.

Modified Paths:
--------------
    trunk/README
    trunk/src/libopenvrml/openvrml/browser.cpp
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/openvrml-player/filechooserdialog.cpp

Modified: trunk/README
===================================================================
--- trunk/README	2009-03-01 20:19:15 UTC (rev 3818)
+++ trunk/README	2009-03-02 01:16:04 UTC (rev 3819)
@@ -268,10 +268,10 @@
    If OpenVRML is configured to be installed to the same prefix as a
 Mozilla-based browser is installed on the system, "make install" will
 install the Mozilla plug-in to the browser's plug-in directory.  This
-should be sufficient to enable support for the "model/vrml" media type
-in the browser.  Entering "about:plugins" in the URL entry bar of a
-Mozilla-based browser will show a listing of successfully installed
-plug-ins.
+should be sufficient to enable support for the "model/vrml" and
+"model/x3d-vrml" media types in the browser.  Entering "about:plugins"
+in the URL entry bar of a Mozilla-based browser will show a listing of
+successfully installed plug-ins.
 
    To run openvrml-player or the Mozilla plug-in from the build
 directories, you must first start an openvrml-xembed process.  Once

Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp	2009-03-01 20:19:15 UTC (rev 3818)
+++ trunk/src/libopenvrml/openvrml/browser.cpp	2009-03-02 01:16:04 UTC (rev 3819)
@@ -3357,7 +3357,7 @@
 /**
  * @brief X3D VRML MIME media type.
  */
-const char openvrml::x3d_vrml_media_type[15] = "model/x3d+vrml";
+const char openvrml::x3d_vrml_media_type[15] = "model/x3d-vrml";
 
 /**
  * @class openvrml::resource_istream openvrml/browser.h
@@ -4725,7 +4725,7 @@
  * @param[in,out] in    an input stream.
  *
  * @exception bad_media_type    if @p in.type() is not @c model/vrml,
- *                              @c x-world/x-vrml, or @c model/x3d+vrml.
+ *                              @c x-world/x-vrml, or @c model/x3d-vrml.
  * @exception invalid_vrml      if @p in has invalid syntax.
  */
 void openvrml::browser::set_world(resource_istream & in)

Modified: trunk/src/libopenvrml/openvrml/scene.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/scene.cpp	2009-03-01 20:19:15 UTC (rev 3818)
+++ trunk/src/libopenvrml/openvrml/scene.cpp	2009-03-02 01:16:04 UTC (rev 3819)
@@ -164,7 +164,7 @@
  * @exception bad_media_type    if @p in.type() is not
  *                              “model/vrml”,
  *                              “x-world/x-vrml”, or
- *                              “model/x3d+vrml”.
+ *                              “model/x3d-vrml”.
  * @exception invalid_vrml      if @p in has invalid syntax.
  */
 void openvrml::scene::load(resource_istream & in)

Modified: trunk/src/openvrml-player/filechooserdialog.cpp
===================================================================
--- trunk/src/openvrml-player/filechooserdialog.cpp	2009-03-01 20:19:15 UTC (rev 3818)
+++ trunk/src/openvrml-player/filechooserdialog.cpp	2009-03-02 01:16:04 UTC (rev 3819)
@@ -73,7 +73,7 @@
         gtk_file_filter_set_name(world_filter, "VRML/X3D worlds");
         gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml");
         gtk_file_filter_add_mime_type(world_filter, "model/vrml");
-        gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml");
+        gtk_file_filter_add_mime_type(world_filter, "model/x3d-vrml");
 
         gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(obj), world_filter);
         world_filter_guard.dismiss();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.