[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-127-g4d35f9b

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  4d35f9b63531c7eaa43aa6af3e91241d43f22e97 (commit)
       via  84f3969e89ba3c692efabb2e09e9733d84900995 (commit)
      from  0e8a12b234be608a292a07355ce8f87a321e84a3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=4d35f9b63531c7eaa43aa6af3e91241d43f22e97


commit 4d35f9b63531c7eaa43aa6af3e91241d43f22e97
Merge: 84f3969 0e8a12b
Author: Bastiaan Jacques <address@hidden>
Date:   Thu Feb 24 17:32:40 2011 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=84f3969e89ba3c692efabb2e09e9733d84900995


commit 84f3969e89ba3c692efabb2e09e9733d84900995
Author: Bastiaan Jacques <address@hidden>
Date:   Thu Feb 24 17:31:27 2011 +0100

    Remove code depending on _controlfd, because it is no longer assigned an FD.

diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index 693c36f..4b4d4f8 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -394,7 +394,6 @@ nsPluginInstance::nsPluginInstance(nsPluginCreateData* data)
     _height(0),
     _streamfd(-1),
     _ichanWatchId(0),
-    _controlfd(-1),
     _childpid(0),
     _filefd(-1),
     _name(),
@@ -465,8 +464,11 @@ nsPluginInstance::~nsPluginInstance()
     }
 
     if (_childpid > 0) {
-        // When the child has terminated (signaled by _controlfd), it remains
-        // as a defunct process and we remove it from the kernel table now.
+        // When the child has terminated (signaled by GTK through GtkSocket), 
it
+        // remains as a defunct process and we remove it from the kernel table 
now.
+        
+        // FIXME: we should ideally do this before the GtkSocket goes away, but
+        // after the delete signal has been sent.
         
         // If all goes well, Gnash will already have terminated.
         int status;
@@ -526,14 +528,6 @@ nsPluginInstance::shut()
         }
     }
 
-    if (_controlfd != -1) {
-        _scriptObject->closePipe(_controlfd);
-        if (close(_controlfd) != 0) {
-            gnash::log_error("Gnash plugin failed to close the control 
socket!");
-        }
-    }
-
-
 }
 /// \brief Set the window to be used to render in
 ///
diff --git a/plugin/npapi/plugin.h b/plugin/npapi/plugin.h
index 6666128..702ab75 100644
--- a/plugin/npapi/plugin.h
+++ b/plugin/npapi/plugin.h
@@ -126,7 +126,6 @@ private:
     std::map<std::string, std::string> _options;
     int                                _streamfd;
     int                                _ichanWatchId;
-    int                                _controlfd;
     pid_t                              _childpid;
     int                                _filefd;
 

-----------------------------------------------------------------------

Summary of changes:
 plugin/npapi/plugin.cpp |   16 +++++-----------
 plugin/npapi/plugin.h   |    1 -
 2 files changed, 5 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Gnash