[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.33, 1.34

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

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

Modified Files:
	openvrml.cpp 
Log Message:
Backed out change to set the plugin_resource_istream initial state to invalid if the Web browser's get-url function fails.  The attempted solution deadlocks.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** openvrml.cpp	18 May 2006 22:20:47 -0000	1.33
--- openvrml.cpp	23 Jul 2006 05:43:12 -0000	1.34
***************
*** 1081,1086 ****
                  openvrml_player_cmd_argv[0] =
                      g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-player");
-                 if (!openvrml_player_cmd_argv[0]) { throw std::bad_alloc(); }
                  openvrml_player_cmd_argv[1] = 0;
              } else {
                  GError * error = 0;
--- 1081,1086 ----
                  openvrml_player_cmd_argv[0] =
                      g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-player");
                  openvrml_player_cmd_argv[1] = 0;
+                 if (!openvrml_player_cmd_argv[0]) { throw std::bad_alloc(); }
              } else {
                  GError * error = 0;
***************
*** 1215,1221 ****
      }
  
!     gboolean request_data_available(GIOChannel * const source,
                                      GIOCondition,
!                                     const gpointer data)
      {
          using std::string;
--- 1215,1221 ----
      }
  
!     gboolean request_data_available(GIOChannel * source,
                                      GIOCondition,
!                                     gpointer data)
      {
          using std::string;
***************
*** 1252,1269 ****
                  string url, target;
                  pluginInstance.request_line >> url >> target;
!                 NPError result =
!                     NPN_GetURL(pluginInstance.npp,
!                                url.c_str(),
!                                target.empty() ? 0 : target.c_str());
!                 std::ostringstream command;
!                 command << "get-url-result " << url << ' ' << result
!                         << '\n';
!                 const ssize_t bytes_written =
!                     pluginInstance.WriteCommand(command.str());
!                 if (bytes_written != command.str().length()) {
!                     // XXX
!                     // XXX Do what here? Console message?
!                     // XXX
!                 }
              }
          }
--- 1252,1258 ----
                  string url, target;
                  pluginInstance.request_line >> url >> target;
!                 NPN_GetURL(pluginInstance.npp,
!                            url.c_str(),
!                            target.empty() ? 0 : target.c_str());
              }
          }