[openvrml-commit] openvrml/src/openvrml-player player.cpp,1.4,1.5

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12827/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Changed the name of openvrml-gtkplug to openvrml-xembed.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** player.cpp	4 Feb 2007 09:30:27 -0000	1.4
--- player.cpp	5 Feb 2007 05:36:12 -0000	1.5
***************
*** 151,156 ****
  
      //
!     // The OPENVRML_GTKPLUG environment variable overrides the default
!     // path to the child process executable.  To allow OPENVRML_GTKPLUG
      // to include arguments (rather than just be a path to an
      // executable), it is parsed with g_shell_parse_argv.  This is
--- 151,156 ----
  
      //
!     // The OPENVRML_XEMBED environment variable overrides the default
!     // path to the child process executable.  To allow OPENVRML_XEMBED
      // to include arguments (rather than just be a path to an
      // executable), it is parsed with g_shell_parse_argv.  This is
***************
*** 158,182 ****
      // a harness like valgrind.
      //
!     gint openvrml_gtkplug_cmd_argc = 0;
!     gchar ** openvrml_gtkplug_cmd_argv = 0;
!     scope_guard openvrml_gtkplug_cmd_argv_guard =
!         make_guard(g_strfreev, ref(openvrml_gtkplug_cmd_argv));
!     boost::ignore_unused_variable_warning(openvrml_gtkplug_cmd_argv_guard);
!     const gchar * const openvrml_gtkplug_cmd = g_getenv("OPENVRML_GTKPLUG");
!     if (!openvrml_gtkplug_cmd) {
!         openvrml_gtkplug_cmd_argc = 1;
!         openvrml_gtkplug_cmd_argv =
              static_cast<gchar **>(g_malloc0(sizeof (gchar *) * 2));
!         if (!openvrml_gtkplug_cmd_argv) { throw std::bad_alloc(); }
!         openvrml_gtkplug_cmd_argv[0] =
!             g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-gtkplug");
!         if (!openvrml_gtkplug_cmd_argv[0]) { throw std::bad_alloc(); }
      } else {
          GError * error = 0;
          scope_guard error_guard = make_guard(g_error_free, ref(error));
          gboolean succeeded =
!             g_shell_parse_argv(openvrml_gtkplug_cmd,
!                                &openvrml_gtkplug_cmd_argc,
!                                &openvrml_gtkplug_cmd_argv,
                                 &error);
          if (!succeeded) {
--- 158,182 ----
      // a harness like valgrind.
      //
!     gint openvrml_xembed_cmd_argc = 0;
!     gchar ** openvrml_xembed_cmd_argv = 0;
!     scope_guard openvrml_xembed_cmd_argv_guard =
!         make_guard(g_strfreev, ref(openvrml_xembed_cmd_argv));
!     boost::ignore_unused_variable_warning(openvrml_xembed_cmd_argv_guard);
!     const gchar * const openvrml_xembed_cmd = g_getenv("OPENVRML_XEMBED");
!     if (!openvrml_xembed_cmd) {
!         openvrml_xembed_cmd_argc = 1;
!         openvrml_xembed_cmd_argv =
              static_cast<gchar **>(g_malloc0(sizeof (gchar *) * 2));
!         if (!openvrml_xembed_cmd_argv) { throw std::bad_alloc(); }
!         openvrml_xembed_cmd_argv[0] =
!             g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-xembed");
!         if (!openvrml_xembed_cmd_argv[0]) { throw std::bad_alloc(); }
      } else {
          GError * error = 0;
          scope_guard error_guard = make_guard(g_error_free, ref(error));
          gboolean succeeded =
!             g_shell_parse_argv(openvrml_xembed_cmd,
!                                &openvrml_xembed_cmd_argc,
!                                &openvrml_xembed_cmd_argv,
                                 &error);
          if (!succeeded) {
***************
*** 196,200 ****
          socket_id_arg_c_str + socket_id_arg.length() + 1);
  
!     const gint child_argv_size = openvrml_gtkplug_cmd_argc + 2;
      gchar ** const child_argv =
          static_cast<gchar **>(g_malloc(sizeof (gchar *) * child_argv_size));
--- 196,200 ----
          socket_id_arg_c_str + socket_id_arg.length() + 1);
  
!     const gint child_argv_size = openvrml_xembed_cmd_argc + 2;
      gchar ** const child_argv =
          static_cast<gchar **>(g_malloc(sizeof (gchar *) * child_argv_size));
***************
*** 203,208 ****
      boost::ignore_unused_variable_warning(child_argv_guard);
      gint i;
!     for (i = 0; i < openvrml_gtkplug_cmd_argc; ++i) {
!         child_argv[i] = openvrml_gtkplug_cmd_argv[i];
      }
      child_argv[i++] = &socket_id_arg_vec.front();
--- 203,208 ----
      boost::ignore_unused_variable_warning(child_argv_guard);
      gint i;
!     for (i = 0; i < openvrml_xembed_cmd_argc; ++i) {
!         child_argv[i] = openvrml_xembed_cmd_argv[i];
      }
      child_argv[i++] = &socket_id_arg_vec.front();