[openvrml-commit] openvrml/mozilla-plugin/src Makefile.am, 1.13, 1.14 openvrml.cpp, 1.38, 1.39

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

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/src

Modified Files:
	Makefile.am openvrml.cpp 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** openvrml.cpp	26 Sep 2006 12:52:36 -0000	1.38
--- openvrml.cpp	1 Oct 2006 05:47:07 -0000	1.39
***************
*** 1063,1068 ****
  
              //
!             // The OPENVRML_PLAYER environment variable overrides the default
!             // path to the child process executable.  To allow OPENVRML_PLAYER
              // to include arguments (rather than just be a path to an
              // executable), it is parsed with g_shell_parse_argv.  This is
--- 1063,1068 ----
  
              //
!             // 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
***************
*** 1070,1091 ****
              // a harness like valgrind.
              //
!             gint openvrml_player_cmd_argc = 0;
!             gchar ** openvrml_player_cmd_argv = 0;
!             const gchar * const openvrml_player_cmd =
!                 g_getenv("OPENVRML_PLAYER");
!             if (!openvrml_player_cmd) {
!                 openvrml_player_cmd_argc = 1;
!                 openvrml_player_cmd_argv =
                      static_cast<gchar **>(g_malloc0(sizeof (gchar *) * 2));
!                 if (!openvrml_player_cmd_argv) { throw std::bad_alloc(); }
!                 openvrml_player_cmd_argv[0] =
!                     g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-player");
!                 if (!openvrml_player_cmd_argv[0]) { throw std::bad_alloc(); }
              } else {
                  GError * error = 0;
                  gboolean succeeded =
!                     g_shell_parse_argv(openvrml_player_cmd,
!                                        &openvrml_player_cmd_argc,
!                                        &openvrml_player_cmd_argv,
                                         &error);
                  if (!succeeded) {
--- 1070,1091 ----
              // a harness like valgrind.
              //
!             gint openvrml_gtkplug_cmd_argc = 0;
!             gchar ** openvrml_gtkplug_cmd_argv = 0;
!             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;
                  gboolean succeeded =
!                     g_shell_parse_argv(openvrml_gtkplug_cmd,
!                                        &openvrml_gtkplug_cmd_argc,
!                                        &openvrml_gtkplug_cmd_argv,
                                         &error);
                  if (!succeeded) {
***************
*** 1103,1113 ****
                  socket_id_arg_c_str + socket_id_arg.length() + 1);
  
!             const gint argv_size = openvrml_player_cmd_argc + 2;
              gchar ** const argv =
                  static_cast<gchar **>(g_malloc(sizeof (gchar *) * argv_size));
              if (!argv) { throw std::bad_alloc(); }
              gint i;
!             for (i = 0; i < openvrml_player_cmd_argc; ++i) {
!                 argv[i] = openvrml_player_cmd_argv[i];
              }
              argv[i++] = &socket_id_arg_vec.front();
--- 1103,1113 ----
                  socket_id_arg_c_str + socket_id_arg.length() + 1);
  
!             const gint argv_size = openvrml_gtkplug_cmd_argc + 2;
              gchar ** const argv =
                  static_cast<gchar **>(g_malloc(sizeof (gchar *) * argv_size));
              if (!argv) { throw std::bad_alloc(); }
              gint i;
!             for (i = 0; i < openvrml_gtkplug_cmd_argc; ++i) {
!                 argv[i] = openvrml_gtkplug_cmd_argv[i];
              }
              argv[i++] = &socket_id_arg_vec.front();
***************
*** 1145,1149 ****
              g_free(working_directory);
              g_free(argv);
!             g_strfreev(openvrml_player_cmd_argv);
  
              if (succeeded) {
--- 1145,1149 ----
              g_free(working_directory);
              g_free(argv);
!             g_strfreev(openvrml_gtkplug_cmd_argv);
  
              if (succeeded) {

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am	28 May 2005 06:44:39 -0000	1.13
--- Makefile.am	1 Oct 2006 05:47:07 -0000	1.14
***************
*** 1,4 ****
- SUBDIRS = openvrml-player
- 
  AM_CPPFLAGS = \
          -I$(mozincludedir) \
--- 1,2 ----