[Gnash-commit] gnash ChangeLog plugin/plugin.cpp [release_0_8_2_rc1]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_2_rc1
Changes by:     Sandro Santilli <strk>  08/02/27 07:47:47

Modified files:
        .              : ChangeLog 
        plugin         : plugin.cpp 

Log message:
        GIOCondition is a bitfield. Patch #6436 by Marcin Cieślak.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.5711.2.23&r2=1.5711.2.24
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.97&r2=1.97.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5711.2.23
retrieving revision 1.5711.2.24
diff -u -b -r1.5711.2.23 -r1.5711.2.24
--- ChangeLog   25 Feb 2008 15:25:41 -0000      1.5711.2.23
+++ ChangeLog   27 Feb 2008 07:47:46 -0000      1.5711.2.24
@@ -1,3 +1,7 @@
+2008-02-26 Marcin Cieślak <address@hidden>
+
+       * plugin/plugin.cpp: GIOCondition is a bitfield. Patch #6436.
+
 2008-02-25 Sandro Santilli <address@hidden>
 
        * server/swf/tag_loaders.cpp (sound_stream_head_loader): turn that

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.97
retrieving revision 1.97.2.1
diff -u -b -r1.97 -r1.97.2.1
--- plugin/plugin.cpp   19 Feb 2008 19:20:51 -0000      1.97
+++ plugin/plugin.cpp   27 Feb 2008 07:47:47 -0000      1.97.2.1
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.97 2008/02/19 19:20:51 bwy Exp $ */
+/* $Id: plugin.cpp,v 1.97.2.1 2008/02/27 07:47:47 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -564,14 +564,14 @@
 bool
 nsPluginInstance::handlePlayerRequests(GIOChannel* iochan, GIOCondition cond)
 {
-       if ( cond == G_IO_HUP )
+       if ( cond & G_IO_HUP )
        {
                cout << "Player request channel hang up" << endl;
                g_source_remove(_ichanWatchId);
                return false;
        }
 
-       assert(cond == G_IO_IN);
+       assert(cond & G_IO_IN);
        int inputfd = g_io_channel_unix_get_fd(iochan);
 
        cout << "Checking player requests on fd " << inputfd << endl;