[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog plugin/plugin.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog plugin/plugin.cpp |
Date: |
Wed, 27 Feb 2008 07:49:18 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/02/27 07:49:18
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&r1=1.5746&r2=1.5747
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.97&r2=1.98
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5746
retrieving revision 1.5747
diff -u -b -r1.5746 -r1.5747
--- ChangeLog 26 Feb 2008 17:41:06 -0000 1.5746
+++ ChangeLog 27 Feb 2008 07:49:18 -0000 1.5747
@@ -1,3 +1,7 @@
+2008-02-27 Marcin CieÅlak <address@hidden>
+
+ * plugin/plugin.cpp: GIOCondition is a bitfield. Patch #6436.
+
2008-02-26 Bastiaan Jacques <address@hidden>
* server/asobj/NetStreamGst.cpp: Use the new check for
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- plugin/plugin.cpp 19 Feb 2008 19:20:51 -0000 1.97
+++ plugin/plugin.cpp 27 Feb 2008 07:49:18 -0000 1.98
@@ -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.98 2008/02/27 07:49:18 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;
- [Gnash-commit] gnash ChangeLog plugin/plugin.cpp,
Sandro Santilli <=